More work on #10
Fixed #77
Merge remote-tracking branch 'upstream/master'