Fixed the bug in if... elif ... else section
Some minor fixing
Merge pull request #6 from daikeren/master

Fixed #5