Felix

Please review changes from master to felix