Merge pull request #1 from cambre/master

Changes look good