cleaning and updates
Merge pull request #1 from delasky/master

cleaning and updates