Merge pull request #1 from christou/master

new contente origin/master'.