final update
Merge pull request #6 from willtsay/testbranch

final update