Merge pull request #1 from bdunn313/working

Working Merged into Master
Merge branch 'master' into triggers