Minor Cloud Fix
Merge branch 'development'