StrawberryKiwis/MaoKiwi — pull request #6 by ComNerd (2014-09-16 21:28:17+00:00)
Title: Merge pull request #3 from StrawberryKiwis/master

Adding changes from master.