Merge pull request #46 from oglueck/master