Merge pull request #26 from Nolux/dev

Dev
Merge pull request #28 from Nolux/dev-PC-NICK

Merge pull request #26 from Nolux/dev