A few fixes
Merge pull request #50 from lexware/patch-1

A few fixes