fabianofranz/origin — pull request #17 by soltysh (2014-11-20 10:58:02+00:00)
Title: [DO NOT MERGE] Fixed @smarterclayton's comments from #384 part 2

Still WIP, do not merge without my approval!