Closes #87
Resolving merge