Merge dev branch

Hooray!

@yayalice @bigsley @charlescharles @jcollins1991 @ldevalliere 
Commented code here and below