Merge branch 'master' of https://github.com/lo1tuma/theorajs