Merge pull request #1 from MikaelSlevinsky/master

Merge feature