Merge pull request #7 from selfshadow/master