cleaned up code
Merge pull request #13 from louisdang/master

pull request