Merge pull request #28 from viruga/master

Merge pull request #88 from inobrega/master
Merge pull request #91 from inobrega/master

Merge pull request #28 from viruga/master