Merge pull request #39 from jcarlosgarcia/master

Fix issue tracker link
Merge pull request #41 from jcarlosgarcia/master

Fix issue #40