Merge branch 'master' into Ericos
Merge pull request #1 from DarkEric/Edgar

Edgar
Merge pull request #2 from DarkEric/Ericos

Merge branch 'master' into Ericos