Merge pull request #1 from bcaffo/master

Oct 1 2014 sync