Fixed if
Merge https://github.com/Tazen/learning
Merge https://github.com/Tazen/learning