FIX#48
Merge pull request #50 from komackaj/fix_48

fix issue #48