Merge pull request #3 from toyes/master