Merge pull request #2 from CruWeb/dev

Dev
Pulling from master