- Fixed issues #11 & #12
- Fixed code warnings from JSLint and JSHint