Fix #135 Can now have multiple copies of layers routed.
Merge branch 'build-cp-vcexpress' into build-cp