Patch 5

- created new pull request due to file conflicts

Signed-off-by: -Underdog- github.underdog@gmail.com