Merge pull request #2 from Nobody28/master

Merge branch 'beta'
Merge branch 'beta'