Fix narrowing warnings
Merge pull request #27 from doug1/narrowing

Fix narrowing warnings