Merge pull request #193 from BlessedRebuS/dev