a new better and improved pol!
Merge branch 'master' into fp