Updating with a few more details
Merge branch 'master' of github.com:tommybutler/dfwpm