PR for dev_1.0

Please remove excess PHP tags if not in use. :p