Refactored block handling.
Updated my name on the license file.