Merge pull request #7 from cstipkovic/master

Merges and JSHint parameters added