Fix nameclash function declaration
Merge pull request #16 from DBezemer/master

Fix nameclash function declaration