Addressed #45 with a minor fix