Merge pull request #26 from SevenBits/working

Update stable branch to version 1.1's codebase
Merge branch 'working' into stable
Merge pull request #36 from SevenBits/stable

Stable