Merge pull request #2 from benctamas/master

toward c4