Updated build system. Added bug fix.
Grrr