Fragments from Bryan Dahmes
Merge pull request #35 from dnash86/master

Fragments from Bryan Dahmes