Extend -force option

Has survived my quick test, but it's something that will generate a lot of heartache if it's not right, so would prefer an independent verification before merging.

Also close #82 on merge.