Merge #195

Resolves #195
Resolves #179