Merge pull request #16 from IRelaxxx/Alex-Dev

Alex dev
RandomCommit
#Julianistgay
Merge remote-tracking branch 'origin/Gustav-Dev' into Alex-Dev