Ulrichs improvements (Closes: #15)