shuttle099/2049 — pull request #3 by shuttle099 (2014-06-12 17:12:53+00:00)
Title: Merge pull request #2 from shuttle099/master

Merge 2.