init
Merge pull request #1 from phariel/master

init