opts handling
Merge remote-tracking branch 'origin/master'
v0.2.3