fix buildAlias method
fix travis errors
Merge branch 'master' into fileSystemOverhaul