Merge pull request #128 from BlessedRebuS/dev