Merge pull request #6 from gers0n/master

up date 27 sept 2014
Merge pull request #8 from gers0n/applying_bootstrap

Merge pull request #6 from gers0n/master