testna sprememba
Merge mmazi
some improvements
Merge pull request #5 from Aambro/master

improvements