Merge pull request #29 from wjdix/master

cleanup