adding to local
Merge https://github.com/bayamp/training-oct2014