Closing issue #5 #6