minor cleanup
Merge branch 'v2.0.0' of github.com:nlf/bucker into v2.0.0