nmcspadden Merge pull request #5 from rickheil/master …