added verbosity option - needs more work
Merge branch 'develop'