Merge pull request #33 from totemo/master