Fixes #2 #3 #4

Version 2! :D