Cleaning it up a bit
Merge branch 'master' into cli
whoops, args wrong way
Merge branch 'master' into cli