resolves #1
merging