More "functional" code
Merge master to staging for version team city build 1.0.178
New release 1.0.178