Se agrego FlexCoreWSORM
Merge origin/master