Merge pull request #3 from esben/master

Various suggestions for improvements