Better, correcter function definitions
Merge pull request #12 from eah13/master

Better, correcter function definitions
Merge remote-tracking branch 'upstream/master'