New features and resolved bugs

- Improved upgrade procedure
- Added ability to change path to keys
- Using only one config 0916
- Resolved some bugs