Closes #4, Closes #6, Closes #7
Incremented Version