Allow type "Long". Fixes #17
Merge branch 'master' into classes