Just added Puzzle class
Merge origin/master