Merge pull request #90 from raistlinthewiz/develop

Before retake