Merge pull request #4 from benctamas/master

toward c4