Refactorized a portion of the code. Segmentation fault arises from the new names feature
Compiles.
Merged branch
merge update