Merge pull request #1 from einfall/master

Update fork
Bugfix for VPS and typo

Bugfix for VPS after code optimization
Fixed typo
Merge pull request #23 from MacDisein/master

Bugfix for VPS and typo