Merge pull request #46 from ericalthatcher/bug/master/practice_rebase

(PE-3)