base stuff
Merge pull request #1 from Ragzouken/master

base stuff