Merge pull request #1060 from bradymiller/smarty-work_1