premier commit
Merge https://github.com/picatout/chipcon