Merge pull request #1 from Riverajakob11/master

all commits
Merge pull request #2 from Riverajakob11/master

all commits 2
Merge pull request #3 from Riverajakob11/develop

2 commits