small tweaks on pull request #103
updated to 0.8.4