Merge branch 'release/0.2.2'
Fix issue causing TPM to not load
Cleaned up using object instead of lots of else if