- Fix bugs
Merge pull request #2 from franktran1991/development

- Fix bugs