updates
Merge pull request #19 from trmccart/master

updates