updates
Merge pull request #10 from Rmarmorstein/master

updates