Feature/fix bugs 20130917b

Please help to review

T