fjw #11

Open
pmg8uxern wants to merge 6 commits from fjw_branch into develop