Merge Pull Request #47 (fixes #47)