Merge pull request #1 from liveservices/master

Accumulated bug fixes: