initialization
Merge branch 'master' of https://github.com/clschwein/P2