updating article, adding other control flows
Merge branch 'gh-pages'