Merge pull request #112 from skolima/master