monken Merge pull request #2 from lharey/master