Code review for shaker
Merge pull request #1 from GregBaugues/master

Code Review