added AIX support
Merge branch 'scientific'