couple of bugs fixed
Merge pull request #1554 from diegosarmentero/master

couple of bugs fixed