first tmp/draft checkin
Merge branch 'master' of github.com:svenvc/zinc