master #18 try to make travis-ci happy