Merge branch 'MasterBugFixing' into 'master'
ensure code compiles on Mac
get the shell onoy when we need it
add Narayana5 classes
Merge branch 'master' into 'MasterBugFixing'