Updated according to @asm89 + some docs in README about * functionality