new optional boolean parameter force. closes #511
Merge branch 'bugfix-511' into develop