Merge pull request #3 from CruWeb/dev

Dev