Implementation
Removed puzzle
Merge remote branch 'fork/#859'