Merge pull request #7 from zhaozhang/master

two mall changes from experiments to discoveries, and one change on astr...