merge from hairizalman/myspata