Merging pull requests #53 - #57