delmadden/testing1 — pull request #6 by delmadden (2014-12-11 14:58:12+00:00)
Title: Merge pull request #5 from delmadden/master

Pull request from master