gitignore
minor fix
tests added
merged