Merge pull request #2 from TheLibratory/master

Merge rollup