Closes #49 (Finally)