- Fixed issues #11 & #12
- Fixed code warnings from JSLint and JSHint
Merge pull request #13 from kaffeinesoft/master

Fixed issues #11 & #12