Massive ammount of commenting
Merge branch 'develop'