Separate code
Merge pull request #11 from PreetamJinka/issues/8

Separate code