Merge pull request #55 from vanfanel/master