Minor update (Version 1.1)

Cleaning code and adding new options .