Merge pull request #51 from thetaiz/master