Merge pull request #218 from tnadeauaria/master