Fixes -Wshadow and -Wsign-conversion compiler warnings.
Merge pull request #19 from realestate-com-au/bug/compiler-warnings

Fixes -Wshadow and -Wsign-conversion compiler warnings.