Merge pull request #15 from terrymun/master

Master
Merge pull request #18 from terrymun/master

Updated Fluidbox
Merge pull request #20 from terrymun/gh-pages

Syncing gh-pages