removed ~
Merge branch 'master' of github.com:Vtan1/apcshw