Merge 'rbrito/support-tube.majestyc.net' (PR #391) with small fix