Merge pull request #245 from AkamaiDASH/development

Fix for Bug # 151 and # 219