Merge pull request #94 from HollyDAI/master

holly
20140526 19:26
20140526 22：19
20140526 22：37
20140526
Merge pull request #95 from HollyDAI/holly

Holly