Merge pull request #12 from godlessfather/master

Importing changes to Wiki Contrib