[master] 20130723 1647

Signed-off-by: lucas <lucas.heewook.park@gmail.com>