Fix a Bug
Merge branch 'erb' into not_doctest