Fix refactorization lost in some merge
Merge pull request #111 from aplanas/master

Fix refactorization lost in some merge