new style main
Merge pull request #18 from ranleung/master

new style main