Topic/build system

Pull request 298 + addition