Merge pull request #37 from Gawdl3y/master

Multiple minor improvements
Prepare 2.1.0 release