Address two first points of #121
Merge pull request #127 from alfonsogarciacaro/master

Address two first points of #121