Closes #194 (closed) It's a quick and (a bit) dirty approach. Will be cleaned up with following work.