Merged pull requests #60 and #62