bnoguchi Merge pull request #49 from niftylettuce/master