Changes in Forked branch

Additions made to my forked repository. Requesting to be included in Main repo.