made my changes mang
Merge pull request #4 from JohnnyLamb/12352_make_johnny_work_master

made my changes mang
12348_make_patrickh_work_master
goat