Merge pull request #32 from 1l2p/master

Bunch of small changes (also see trello board)