Merge pull request #74 from nromanen/master

Merge m->y
vpekar: review
valid reset pass
merge
merge