Switched PHP and Java to use identical template
Updated for v0.1.1
Updated for v0.1.1