buttons renamed
Merge branch 'amastm' of https://github.com/gpernelle/NeedleFinder into amastm