.sp file processing added
Completions stored in sets
Merge branch 'develop'