resolved issues 
#7
#8
resolved issue #7