close #6
Merge pull request #12 from omegamega/master

deploy20130305_2