Merge branch 'master' of github.com:jelitox/huayra