Merge pull request #41 from mdeters/tianyi-merge
authorTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 24 Jun 2014 06:35:45 +0000 (14:35 +0800)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 24 Jun 2014 06:35:45 +0000 (14:35 +0800)
Merge from Tianyi


Trivial merge