Merge pull request #1 from gorefest/master

Upgrade 0.5
Merge pull request #2 from gorefest/stable-version

Merge pull request #1 from gorefest/master