Merge remote-tracking branch 'upstream/master'

Merge README
Merge remote-tracking branch 'upstream/master'

Merge with upstream.
Fix bugs.
Merge pull request #29 from shadowjay1/master

Fix bugs.