Merge pull request #95 from Therzok/master

Misc fixups