* Improved the option reading process and some code cleaning.