Merge pull request #1 from 42cups/master

1