Additions to build tool (#6)