Resolve #9

I was having the same issue as @GitColPanic, so I took a stab at #9.