Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Updated documentation
Merge pull request #2 from eroot/master

Updated documentation