commit 2: update comments
Merge remote-tracking branch 'origin/master'
commit 2: update readme