Fixed #6 with merge of travis changes

Thanks to @sassman for the details