Merge pull request #1 from ork/master