structure changes
cleaning
Merge pull request #1 from wizardskill/master

Merge changes in upstream