Merge pull request #4 from rinnly/master