Making everything beautiful
Merge pull request #20 from shiyingzheng/master

Making everything beautiful