Merge from master - mdipierro/lms299

This includes an update from the master project.