merging with scinet
Merge branch 'master' of github.com:sievers/ninkasi_c