Fixes Issue #4

Hi James,

should we continue this way? I'll send pull requests, walking step by step through my comments