Fixed Return Issues
Merge origin/master