Fix issue #28
Fix issue #29
Merge remote-tracking branch 'origin/master'