Changed build system to use make