Merge pull request #35 from antonkorotkov/development

MultiSite fixes.