rebased on develop and added .gitignore file