fixed ticket #19
fix ticket 9, 23
fix conflict