- Add md5 support
- Add flag for optional switching of options