Patch 2

Merged two PRs