ticket:5 some changes
ticket:5 merge to master