Merge pull request #5 from aureljared/modern

Large update
Merge pull request #6 from aureljared/legacy

Merge pull request #5 from aureljared/modern