Final Changes
Merge pull request #3 from magwalk/master

Final Changes