Merge pull request #157 from MSOpenTech/development

fixes for completion, buffering and scheduling