ready to merge
Merge branch 'master' into stylebranch
Merge pull request #20 from paulhyunkim/stylebranch

Stylebranch