Merge pull request #8 from cecele/master

maj30/04