tickiet:4 fixing unit test - I accidentally used non-standard js function
ticket:1 Barista try #2
Merge branch 'barista'