refs #18. Add a new emp5.3 template
refs #15. fixed some bugs.
Merge pull request #19 from jcrom/master

merge with trunk