All ambiguous names changed, helpers fixed with callbacks.
Merge pull request #10 from audun-/master

All ambiguous names changed, helpers fixed with callbacks.