Merge pull request #31 from Creego/master