Code review fixed
Merge pull request #18 from amlweems/rebasing

Code review fixed