Merge pull request #9 from revuls/master

Merging to Developer branch
Merge pull request #10 from revuls/development

Merge