removed a potentially misleading period from a message
added -x parameter
Merge branch 'develop'