By Wenjia Wu
Merge pull request #14 from Chianti5/master

By Wenjia Wu