Merged Pull Request #1 and #3
Merged Pull Request #4