Resolved GitHub Issues

Resolved #312, #332