Merge pull request #90 from raistlinthewiz/develop

Before retake
Merge pull request #91 from raistlinthewiz/master

Merge pull request #90 from raistlinthewiz/develop