Fix #8
Merge remote-tracking branch 'public/master'