Merge pull request #32 from boring12345/master

Updating the Beta
Merge branch 'master' into beta
Merge pull request #34 from boring12345/master

Merging the branches
Merge pull request #35 from boring12345/master

Merging the branches
Closing the tags
Merge pull request #36 from boring12345/beta

Beta