Merge branch 'fork_branch'
Added support for Maki icons

Thanks to becompany