elvismt Merge pull request #21 from phako/master …