Merge pull request #3 from cstipkovic/master

Pull request described below
Merge remote-tracking branch 'upstream/master'