Merge pull request #372 from jcmurray/master

Version 1.2.0