Issue  #46
Issue #47