Merge style from dev-0.0-alpha
Merge php from dev-0.0-alpha