bootstrap test
Merge pull request #1 from tuxlab/master

bootstrap test
auto merging from pull request