Improved determining wheteher to use WHERE or HAVING statements
Improved composing the ORDER BY statement
Updated README.rdoc