Merge pull request #1 from cstipkovic/work

Changes accepted!