Commit

just a commit to push all the code changes I have done.
Merge pull request #19 from Xracer/WIP

Commit