Merge pull request #85 from chrqls/dev

Crap pull request to delete questions...