merged with david
Merge branch 'master' of github.com:caminio/caminio-rocksol