<feature/icons> add icons #95
<stable/0.1> Merge branch 'feature/icons' into stable/0.1