conflict resolved
Merge branch 'unclutter' of https://github.com/valyakuttan/introfp into unclutter
source simplified