Refactor Code.
Merge pull request #7 from autscc/master

Refactor Code