some fixes
Merge pull request #1 from razpeitia/master

Some fixes