Dev merge to master - Issue#138

Dev merge to master - Issue#138