Use Gruntjs options helper
Merge branch 'issue-9' into develop