v1.02 fixed warnings
gitignore
merge fixes