Issue#56

resolves #56