Update Master edit
Merge pull request #1 from krismailss/Branch-01

Update Master edit