Closes #1 for changes