add killerfish
Merge branch 'master' into gh-pages
merged in changes from master