Fix #7 - improve intitiviness