Add Generic option
Merge branch 'master' of github.com:jdodson/zemus