updated for issue #1

This takes care of #1