Merge pull request #20 from willu47/master

Solves #18