moxie0 Merge pull request #1 from fs111/master