A little clean up.
Merge branch 'dev'