NattyNarwhal/wmx — pull request #4 by NattyNarwhal (2014-05-09 22:54:48+00:00)
Title: Integrate remaining

Merge in the rest of rsharman's changes, solves #1