Code finalized
Merge pull request #2 from sharrington93/master

Code finalized