merge
Merge branch 'rubyfied' of github.com:caminio/caminio into rubyfied