Remove unnecessary boxing/unboxing
Merge pull request #492 from naoliv/pull18

Remove unnecessary boxing/unboxing