Initial code commit
Merge pull request #1 from Vorathe/master

Initial code push