Merge pull request #222 from iXit/master