Version 1.0.1 Patch
- Adds some flexibility for flags not to be set
- Removed & refactored older code