Issue #4 : Corrected some type problems.