Merge branch 'develop'
Updated README, added icon, fixed buttons.