Merge pull request #4 from vobe/master