Develop

Merge the newest ajwdewit source code changes