Circuit building works
Merge git://github.com/andres-erbsen/vindicat