Some changes in late May
Merge pull request #6 from ljubar/master

Some late-May changes