Merge pull request #9 from terryrankine/devel

Master Template update