Merge pull request #33 from PixelOrange/master

Major wiki revision
Merge pull request #4 from alexames/master

Merge pull request #33 from PixelOrange/master