Merge pull request #1 from caboteria/master

2 bugs fixed