mdparker Merge pull request #9 from kas-luthor/master