trying to make travis happy
Merge pull request #541 from nikhan/master

trying to make travis happy