More tweaks and fixes
Merge pull request #63 from chylex/master

More tweaks and fixes