Dražen Odobašić Merge pull request #27 from sabman/patch-1