20140928 - Modified the launcher class