using correct variable data types instead of using generic Object type
removing fixme comment on the method as it is fixed
Fixing the case where the generic Object variable is repeatedly used and using ternary operator
Merge pull request #3 from nallagsoc/1.12

using correct variable data types instead of using generic Object type
Merge branch '1.12'