Fix bug
Merge pull request #354 from panseo/test

Fix bug