Merge pull request #9 from FearFree/dev

Push to release version 1.1