Pull Request Dev_1.0

Please avoid using <?=  , other phh version might not support this.  Use <?php  instead