Merge Bug fixes 5-20-2014
commit