fixing #88
added pull requests 48,53,63,84,88