2014-06-28: Upgraded build system