Fix to remove compiler warning.
Fixes to resolve issue#92
Fix for issue#55