diff --git a/automaton/machines.py b/automaton/machines.py
index a1c6c35..1dac13c 100644
--- a/automaton/machines.py
+++ b/automaton/machines.py
@@ -113,16 +113,16 @@ class FiniteMachine(object):
 
     @property
     def default_start_state(self):
-        return self._default_start_state
-
-    @default_start_state.setter
-    def default_start_state(self, state):
         """Sets the *default* start state that the machine should use.
 
         NOTE(harlowja): this will be used by ``initialize`` but only if that
         function is not given its own ``start_state`` that overrides this
         default.
         """
+        return self._default_start_state
+
+    @default_start_state.setter
+    def default_start_state(self, state):
         if self.frozen:
             raise excp.FrozenMachine()
         if state not in self._states:
diff --git a/doc/source/api.rst b/doc/source/api.rst
index 442b484..cf60b2b 100644
--- a/doc/source/api.rst
+++ b/doc/source/api.rst
@@ -11,6 +11,7 @@ Machines
 
 .. autoclass:: automaton.machines.FiniteMachine
     :members:
+    :special-members: __iter__, __contains__
 
 .. autoclass:: automaton.machines.HierarchicalFiniteMachine
     :members: