work on issue #121
fixed warnings; done issue #121