build fixes - still failing.
Merge branch 'master' of github.com:TIARDI/ARDI