Merge pull request #2 from amifsud/master

changin initialization