Large update
Merge pull request #5 from aureljared/modern

Large update