Fixes #1

Please reject this if one of the following are true:

- I should have merged the _issue-branch_ into my fork first, then make the pull request - could not think of a good / bad scenario regarding this - at this hour :)
- I should have squashed the commits into a single one - I did not because I though it would be quite good to leave the two of them separate (apply the preparatory refactoring, then fix the issue)
- I should have done something to get rid of the commit:  _"Merge pull request #1 from ctrucza/master"_ - as it is not quite related to this issue (it appears in this pull request because I created the _issue-branch_ after pulling from your repository into my fork).

Thanks :)