Merge pull request #15 from AlectaInfo/Farazath

Farazath
first commit after cloning new one :(