New stuff!
Merge branch 'master' of https://github.com/boh1996/salmon