Adding some more custom bits
Merge pull request #2 from russmckendrick/development

Adding some more custom bits