switched to Builder
minor changes during review
Merge branch 'master' of github.com:akquinet/needle