Don't really need this at the moment
Merge pull request #60 from aalness/master

Don't really need this at the moment