Merge pull request #1 from cleargif/tweaks

added whitespace and tweaks variables
Merge branch 'master' into features/umd