final commit
Merge pull request #5 from JamesLumioso/master

final commit