merged

Merge pull request #6 from seljucarlo/develop