Merge pull request #1 from PreacherJayne/Longboat

Want to add changes from Longboat to Master.
Merge pull request #2 from PreacherJayne/master

Merge pull request #1 from PreacherJayne/Longboat