Version update, new option added, code was re-factored for better performance