This should close issue #4

Now it should really close it