Add capturing error output
Merge pull request #7 from Ragnar-F/patch-1

Add capturing error output
Cleaned up completion list
Added missing completions/keywords