Fixed changes
Merge branch 'master' of https://github.com/joester/ICS168Swarch