Better comments & function names.
Merge branch 'dev'