fixing things up
Merge pull request #3 from tansaku/master

fixing things up