Fixed #22

Thanks @slindberg