Merge pull request #6 from pashazel/start

Start
Merge pull request #7 from pashazel/start

Start
fixed
Merge remote-tracking branch 'origin' into start