Resolved #96 merge conflict