Closes #2 issue