Merged #44 from @dheckman and @toreystapleton