Merge pull request #11 from revuls/master

Merging to Developer branch