ticket:6 change script
ticket:6 merge to master