Updates in #2 (closes #2)