Fix Order by (fixes #4)
Prepare to new release
Fix readme about old error with ordering
Resolve some conflicts