Rewrite README (closes #5)
Merge remote-tracking branch 'upstream/master'