Merge pull request #112 from armitasp/master