Pull Request #72 fixes