Merge pull request #226 from BlessedRebuS/dev