Updated to support cross-compilation for 0.12 and 0.13