Develop

Closes #192-197, 213