Mughisi/Oxide-2 — pull request #1 by Mughisi (2014-10-15 20:30:10+00:00)
Title: Catching up on the changes

Merging with latest version.