support 3
Merge pull request #3 from jugyo/3

better support 3