Commit 25673eded3ea1aa4db45a1961cf85ed3282f2912

Jake 2014-06-15T19:07:11

Merge pull request #1 from ckolivas/master Sync with new upstream version