sync up bug fixes to template
Merge pull request #34 from ohanar/sync_with_template

sync up bug fixes made to template