This fixes issue #5

2016-08-18, Paul Beltyukov