Merge pull request #28 from cdau/master

E37