fixed indent
fixed freeing of options
Merge branch 'fix-leaks'