Minors bug fixes
version 0.6.0-dev. See README.md for updated documentation.