bug fix, v1.1 for production
Merge branch 'master' of github.com:StefanTanovic/master into verzija_2
added notes and complete coding