Merge pull request #4 from silveur/develop

V1.0
Merge pull request #5 from silveur/develop

updated gitignore
master merged in