Get things done, quickly.
Merge pull request #1214 from eridal/master

Get things done, quickly.