Merge pull request #21 from 73/develop

Fix for issue #20
Fix for reoccurred issue #5;