Add some features (thanks @Florian Kohlmayer)