Merge pull request #794 from Ixiter/develop