Merge pull request #21 from najela/master

Fixed gallery problem
Merge pull request #4 from mrstocks/master

Merge pull request #21 from najela/master