Change
Merge pull request #35 from boring12345/master

Merging the branches