small fixes and refactor
Merge branch 'master' of github.com:aludwiko/fluentbuilder