added docblock
use sami 1.x, dev-master is too new
preparing new release
merge for 0.9.0-rc.3