Merge pull request #2 from Livaell/Livaell

23.04.2014 work send to Liv