Merged Pull Request #1 and #3
Merged Pull Request #4
Merge branch 'bug-fix'