closes issue #6 #15