Fixes to tickets 903 & 976
Merge pull request #3 from jazzyeagle/master

Fixes to tickets 903 & 976