Merge pull request #3 from koomerang/dev

Site update
Merge pull request #5 from koomerang/master

Merge pull request #3 from koomerang/dev