Merge pull request #4 from robbat2/master

Lots of small improvements