Fixes #6
Fixes #10
Merge pull request #11 from seesharper/master

Fixes #6 #11