Merge pull request #15 from bizimakin/gh-pages

xmas update