fix issue #3
Merge remote-tracking branch 'upstream/master'
revert 19b69f21d409375ad8362c04186b246c1749fc8e