final push
Merge pull request #18 from rmcdole/master

final push