Closing Issues

Closes #16
Closes #13
Fixing Issues on GitHub.com

Closes#16
Closes#13