Merge pull request #2 from BlockadiaTeam/master

Update
Merge pull request #8 from pslam92117/master

Merge pull request #2 from BlockadiaTeam/master