Fixed issues on GitHub

Closes #1
Closes #2
Closes #3
Closes #4