init phase 3
Merge pull request #35 from pondering/master

init phase 3
mv
Merge pull request #36 from pondering/master

mv
mv