fixing general bugs
fixed issue Issue #209