Merge pull request #1 from therealfakemoot/master

.
Adapted tests, and implemented length checking for reorder_keys.
Merge pull request #4 from JustusW/master

Minor change for reorder_keys length checking.