Commit 298f5df6ffde6ac526dcf48cc60d495c5cfbff93

Nelson Elhage 2018-08-14T04:01:04

Further review comments, fix the build