Merge pull request #54 from cgoodling/master

Update my branch