Merge pull request #9 from FearFree/dev

Push to release version 1.1
Merge pull request #1 from zD12/release

Merge pull request #9 from FearFree/dev