cgoodling/422 — pull request #55 by kaleyng (2014-12-04 01:41:53+00:00)
Title: Merge pull request #54 from cgoodling/master

Update my branch