master
fixed memory leak due to use popt incorrectly
Add missing include
whitespace: fix issues found by pre-commit