Fixes #22 kind of

Not completely satisfied but, cant fix it if it works.