merged with master
merged with master
Merge pull request #3 from zhukov/gh-pages

Sync with zhukov's