issue #101 #87 addressed
issue #101 #87 addressed