Make types more uniform
Merge pull request #17 from hanskr/hamnis_pull

Make types more uniform