First commit including update to skeletor profile
fixed current merge