changed code some more
Merge branch 'master' of https://github.com/omer4d/playground into branch1