Merge pull request #2 from coderaiser/dev

Dev