Update features from live
Merge pull request #23 from ratajczak/master

Update features from live