Bug fixes
Merge pull request #25 from 28msec/grunt

Grunt integration