Merge pull request #4 from arranubels/master

Bug fixes