quick update for #98
updating #98
bugdix #98
almost done #98