Merge pull request #35 from pondering/master

init phase 3