Merge pull request #26 from andreqi/pre_launch_fix

Pre launch fix
da gusto