Modified code to fix defect 283
Modified code to fix
defect 283
rimvydas-urbonas/ui-toolchain-demo-1480361338284,rimvydas-urbonas/ui-toolchain-demo-1480361338284,rimvydas-urbonas/ui-toolchain-demo-1480361338284,rimvydas-urbonas/ui-toolchain-demo-1480361338284