More features

by Pawel Kadysz