This fixes #2 and resolves  #1