Merge pull request #302 from xfstart07/master