Feature/bugfix #87

Closed jamessahunter closed 10 months ago