Merge pull request #119 from BlessedRebuS/dev