Last touches.
Merge branch 'master' of https://github.com/AL333Z/ASWProject