Added the ability to perform a dry run
Merge branch 'develop'