Resolved GitHub issues

Resolved issue #362, #364