solving issue #68 #99

Closed gabrielguim closed 6 years ago