Squashed commit of the following:

commit 0f096e97a8aa482d0512cb6f70fcb5b18f63f2ec
Author: John F. Lewis <johnflewis93@gmail.com>
Date:   Mon Mar 24 18:59:30 2014 +0000

    fix