Merging PRs 57 and 58