#9 removed some compiler warnings.