Merge pull request #4 from brandwe/master

Documentation and Upstream code refresh