Merged mdipierro/lms299 master branch

These are the latest updates for the project.