damnever Merge pull request #17 from damnever/dev …