Strip unused code
Minor fix for processing options, -d and -r
Minor fix of lookup method
Cleanup
Cleanup
Merge branch 'develop'
Add and implement -f and -s option