This closes #23 and also closes #25. 2 for 1! ;)