fixing major changes on branch
Merge pull request #23 from paopay/fixing_my_changes

fixing major changes on branch