Adjusting to new instance
Merge branch 'master' of https://github.com/mantazer/Project-Pulsar