Merge pull request #11 from crumblingstatue/master

Various improvements