Merged pull requests #49-#51