Merge pull request #36 from Redmain/dev

Dev