Merge pull request #114, #115 by CurlyMoo