Merge pull request #1 from PreacherJayne/Longboat

Want to add changes from Longboat to Master.