fixed #11
fixed #13
Merge pull request #14 from ritou/bugfix-20130904

Bugfix 20130904