some changes
Merge pull request #1 from cristian100/master

ok