Bug 311

merging into master