Hotfix. This needs to be reviewd
Added Range
Merge pull request #5 from amartinj/hotfix

Hotfix. This needs to be reviewed in later commits