Merge pull request #36 from viruga/master

Merge pull request #104 from inobrega/master
Merge pull request #105 from inobrega/master

Merge pull request #36 from viruga/master