Properly fixed #50 now.
And the code makes sense now.