Finished it, fixes #1

It's done.
Now its really done.