fixes #10 and resolves #7
Merge pull request #13 from diegoliv/master

fixes #10 and resolves #7