Merge pull request #357 from jpecht/master

updated build
Merge pull request #358 from jpecht/master

added help buttons to opening popup...unfortunately =[