Resolved GitHub Issues

Resolved #158, #331, #336