removed dependency from ActiveSupport, fixed bugs