Merge pull request #68 from BostjanOb/master