Issue #67  fixed
Issue #72  fixed
Issue #73  fixed
Merge remote-tracking branch 'origin/master'