Close #17, close #18; from a different branch

This commit tries to close issues from a branch other than
master without actually merging it into master.
Merge pull request #19 from mcornella/new-branch

Merge closing commit from new-branch