Closes #2
Closes #1
Little fix