Commit david 13/8/2014-17:20
Merge branch 'master' of https://github.com/raymondchandra/hfi