Hydriz/twinkle — pull request #1 by Hydriz (2013-04-03 09:45:10+00:00)
Title: Update to master

Update from upstream's master