fix #170
fix #168
Merge pull request #171 from ericvincenterv/master

#168