fix Issue #3
small updates