Merge pull request #111 from BlessedRebuS/dev