Fixed Issues

- Fixed Issue #1
- Fixed Issue #2