Guidelines update. This fixes #4