Squashed commit of the following:

commit 891e8ad26542d0d5510e1504546f0497a50e512d
Author: Kaoru <dev@kaoruk.com>
Date:   Fri Sep 20 10:36:04 2013 -0500

    Fixed calculations and add a method to return a distance based on duration