made changes to work better with YCM plugin
merged