fixed issue #19
fixed issue #9
use pep8 name