Bundle update 20141230093154
Merge pull request #41 from tachikomapocket/tachikoma/update-20141230093154