Resolved Github Issues

Resolved issues #362, #364