Version 1.0.17
- Merge Pull Request #191 - (Fix Issue #190)
- Merge Pull Request #166 - (Fix Issue #130)
- Merge Pull Request #204
- Merge Pull Request #185