Merge pull request #4 from projectcontrol/DEV

Code Merged
Merge pull request #2 from projectuserone/master

Merge pull request #4 from projectcontrol/DEV