follow trunk

Fix #21
bootstrap