diff --git a/docs/conf.py b/docs/conf.py
index 80d3266..6a48ed7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,18 +48,20 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
+from steam import __version__, __author__
+
 project = u'steam'
-copyright = u'2016, Rossen Georgiev'
-author = u'Rossen Georgiev'
+copyright = u'2016, %s' % __author__
+author = __author__
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
-#
+
 # The short X.Y version.
-version = u'0.6.0'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = u'0.6.0a'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -286,3 +288,6 @@ texinfo_documents = [
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
+
+# AUTODOC
+autodoc_member_order = 'bysource'
diff --git a/steam/__init__.py b/steam/__init__.py
index ecd513c..2d9fa5c 100644
--- a/steam/__init__.py
+++ b/steam/__init__.py
@@ -1,7 +1,7 @@
-__version__ = "0.6.0"
+__version__ = "0.6.1"
 __author__ = "Rossen Georgiev"
 
-version_info = (0, 6, 0)
+version_info = (0, 6, 1)
 
 from steam.steamid import SteamID
 from steam.webapi import WebAPI