Fixes #8
Fixes #6
bump version
Merge pull request #1 from arckinteractive/master

merge master