Pull Request to address issues 12, 13, 14, 16, 18