Changed the way  and  are done. Thank you @jlahm. Issue #99