Adding latest commits to master branch

@presley1845 merging in your changes :thumbsup: