Merge pull request #5 from NS-Projects/master

Sync
clean-up for Artur
Update .gitignore
Merge pull request #7 from NS-Projects/Artur's-branch

Artur's branch cleaning and improving