stashed things
merged conflicts
Merge branch 'master' of https://github.com/mardrey/Eda031
fixed NAK thing