Merge pull request #1 from eucalyptuss/development

Merge from Development
improved structure
Merge pull request #2 from eucalyptuss/master

update fixes