Merge pull request #146 from hlee/master

from jael