Revert "Merge branch 'feature/move_reference_vector' into 'master'"

This reverts merge request !56 (merged) as it contains bugs! @marco.agnese please fix it.