Merge pull request #20 from flymke/dev

Dev
Refactore the ignored