Working now
Merge pull request #3 from jncormier24/dev

 Working now