Merge pull request #71 from MysticTreeGames/master

Master Changes
Merge pull request #72 from MysticTreeGames/devel

Merge pull request #71 from MysticTreeGames/master