Suppressed a few warnings
Merge branch 'master' into dev