Repost

Missed some file so reposting everything I have so far.
Merge pull request #7 from yi7/Code

Repost