Resolved Github issues

Resolved issue #259, #280