Code refacroring
Merge pull request #13 from ctharindace/master

Code refacroring