Merge pull request #1 from BlockadiaTeam/master

Merge pull request #2 from pslam92117/master