Merge branch 'master' into HEAD
changed default values to fit our systems