Revert "Bug fixing"
Merge pull request #2 from ecarlini/revert-1-master

Revert "Bug fixing"