fix some bugs
Merge pull request #7 from yamanetoshi/serviceBugFix-20130718

fix some bugs