Fix for #34

I did some changes because I had to sync before commiting :P