closes #19 merged file manually