Merge branch 'master' of shepheb/amber into master

CONTRIBUTORS

@@ -33,3 +33,4 @@ Norbert Hartl (github:noha)
 Masashi Umezawa (github:mumez)
 Daniel Cohen (mailto:dcohenb@gmail.com)
 Steven Rémot (github:stevenremot)
+Braden Shepherdson (github:shepheb)