Merge pull request #6 from mcandre/master

Cleaned up with JSHint