Nicer function declaration
Merge pull request #23 from jillesme/master

Nicer function declaration