Added matrix indexing checks
Fixed path issue in EHS
Variable abstraction in EHS
Added generate edge weights for EHS
Merge remote-tracking branch 'upstream/master'