Merge pull request #1 from mckoss/patch-1

rewrite with Dad
started
Merge remote-tracking branch 'upstream/master'