Comments and changes from David Brown
Merge branch 'master' of http://github.com/jamesrhester/twinning-dic

Merging after receiving David Brown's updates