Merge pull request #391 from rbrito/support-tube.majestyc.net