Merge pull request #49 from rsrock/master

Fix popup menus on OS X
Fix deprecation