Absa's changes done
Merge pull request #1 from FAbsalom/changes

Absa's changes done