Working on tweaking configurations
Merge branch 'master' of https://github.com/mantazer/Project-Pulsar