fixed clang++ and g++ c++11 "narrowing convertion" compilation errors
Merge pull request #2 from ukreator/upstream_master

fixed clang++ and g++ c++11 "narrowing convertion" compilation errors