Merge pull request #27 from SpringOx/master