Removed dependency on $timeout. #28