QuickStartChanges-10312014-1

Some code modified to fix some issue