diff --git a/sapphiredocs/.piston.yml b/sapphiredocs/.piston.yml
index dfe3cd4..a8e0a32 100644
--- a/sapphiredocs/.piston.yml
+++ b/sapphiredocs/.piston.yml
@@ -1,7 +1,7 @@
 --- 
 format: 1
 handler: 
-  commit: 94121f0a662555aefa6871726f57f56de5332edb
+  commit: b1c93bd27a232267a2ab9e05f9372982b0781236
   branch: master
 lock: false
 repository_class: Piston::Git::Repository
diff --git a/sapphiredocs/code/DocumentationViewer.php b/sapphiredocs/code/DocumentationViewer.php
index d5e8bf9..d92d333 100755
--- a/sapphiredocs/code/DocumentationViewer.php
+++ b/sapphiredocs/code/DocumentationViewer.php
@@ -156,7 +156,7 @@ class DocumentationViewer extends Controller {
 			$this->module = $firstParam;
 			$this->lang = $secondParam;
 			
-			if(isset($thirdParam) && (is_numeric($thirdParam))) {
+			if(isset($thirdParam) && (is_numeric($thirdParam) || in_array($thirdParam, array('master', 'trunk')))) {
 				$this->version = $thirdParam;
 			}
 			else {