Fixing issues, helping test coverage
iMerge branch 'master' into github