Updated fake
Updated solution
Removed printf debugging
Merge branch 'develop'