Merge pull request #30 from fatcerberus/master

Various fixes