working on issues - fixes #3

blabla
Awesome job! Go ahead and merge this back into master.