Improved jshintrc reading
Bug fixin
Merge branch 'develop'
Release 2.1.2