Merge pull request #68 from Quexer69/develop