Added some comments
Added text rendering
Merge branch 'development'