Merge pull request #52 from XhmikosR/master

Minor improvements
Gruntfile.js: minor refactoring.
Update dependencies.