More changes to avoid tests failing
Update features from live
Merge pull request #21 from ratajczak/master

Update features from live