Basic changes
Merge pull request #4 from ZenProductions/master

Basic changes