rewrite using grunt convention for files selector and options, added unit tests
Merge pull request #1 from Bartvds/develop

merge develop branch to master