Merge pull request #73 from xgoat/master