Relhajj final issues

[relhajj]

merging relhajj_final_issues into relhajj_issues so that there is one PR for all issues left.

Note that the issues dealt with in this branch were:

• issue #19 , #36 and #22