Merge pull request #1 from generalidea/master

Integrate to Project
Merge pull request #2 from generalidea/master

Fixed the flow
Add Rookie
Merge pull request #1 from superpixel/master

update from main source