full update
Merge pull request #3 from jpecht/master

full update