Fixed #20, added new variable