- avoid some integer conversions
Merge pull request #88 from aschnell/master

- avoid some integer conversions