Initial commit
Adding an ability to pass a map of arguments
Merge branch 'dev'