fixes
fixes 2
Merge pull request #1830 from tysonn/5-20-2014

Updating template