ComNerd/MaoKiwi — pull request #3 by ComNerd (2014-09-16 21:27:34+00:00)
Title: Adding changes from master.

Getting stuff up to date.