* Cleaning and corrections.
Merge pull request #31 from armm77/master

* Cleaning and corrections.