Incomplete - task : Modified some code
Merge pull request #2 from jhammell/dev

Incomplete - task : Modified some code