Merge pull request #2 from TheLibratory/master

Merge rollup
Merge pull request #9 from milsyobtaf/master

Merge pull request #2 from TheLibratory/master