ColinFay Merge pull request #6 from benkates/master