ryanmcdermott Merge pull request #5 from forstmeier/master …