This closes #114 (cherry picked from commit 70c278115249898132490a89a548fd936c09f54b) (cherry picked from commit e54de94e5ab40405d837ee7664e90921f5bc38e4)
This closes #114 (cherry picked from commit 70c278115249898132490a89a548fd936c09f54b) (cherry picked from commit e54de94e5ab40405d837ee7664e90921f5bc38e4)