Fix bug
Merge pull request #3 from cielsis/Dev

Fix bug