Merge pull request #11 from revuls/master

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

Merge pull request #11 from revuls/master