Merge pull request #16 from bobmaerten/master

A few updates