Fixing Travis issues with PR#57 (Add swap support)