Merge pull request #107 from burlock/development

MR Oct_14 AddOn 4