Cut release v4.8.2

* Updating grammars * Bumping to v4.8.2
Add ".es" to recognised ECMAScript extensions
2025-10-29 17:50:22 +00:00 · 2016-03-29 17:02:30 -06:00 · 2016-03-29 13:36:13 -06:00 · 2016-03-29 07:58:38 -06:00 · 2016-03-30 00:24:50 +11:00 · 2016-03-27 20:35:30 -06:00
1516 changed files with 225302 additions and 65262 deletions
--- a/samples/CoffeeScript/empty.coffee
+++ b/samples/CoffeeScript/empty.coffee
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
-Gemfile.lock
+/Gemfile.lock
 .bundle/
-vendor/
+benchmark/
+lib/linguist/samples.json
+/grammars
+/node_modules
+test/fixtures/ace_modes.json
+/vendor/gems/
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,703 @@
+[submodule "vendor/grammars/go-tmbundle"]
+	path = vendor/grammars/go-tmbundle
+	url = https://github.com/AlanQuatermain/go-tmbundle
+[submodule "vendor/grammars/PHP-Twig.tmbundle"]
+	path = vendor/grammars/PHP-Twig.tmbundle
+	url = https://github.com/Anomareh/PHP-Twig.tmbundle
+[submodule "vendor/grammars/sublime-cirru"]
+	path = vendor/grammars/sublime-cirru
+	url = https://github.com/Cirru/sublime-cirru
+[submodule "vendor/grammars/SublimeBrainfuck"]
+	path = vendor/grammars/SublimeBrainfuck
+	url = https://github.com/Drako/SublimeBrainfuck
+[submodule "vendor/grammars/awk-sublime"]
+	path = vendor/grammars/awk-sublime
+	url = https://github.com/JohnNilsson/awk-sublime
+[submodule "vendor/grammars/Sublime-SQF-Language"]
+	path = vendor/grammars/Sublime-SQF-Language
+	url = https://github.com/JonBons/Sublime-SQF-Language
+[submodule "vendor/grammars/SCSS.tmbundle"]
+	path = vendor/grammars/SCSS.tmbundle
+	url = https://github.com/MarioRicalde/SCSS.tmbundle
+[submodule "vendor/grammars/Sublime-REBOL"]
+	path = vendor/grammars/Sublime-REBOL
+	url = https://github.com/Oldes/Sublime-REBOL
+[submodule "vendor/grammars/Sublime-VimL"]
+	path = vendor/grammars/Sublime-VimL
+	url = https://github.com/SalGnt/Sublime-VimL
+[submodule "vendor/grammars/ColdFusion"]
+	path = vendor/grammars/ColdFusion
+	url = https://github.com/SublimeText/ColdFusion
+[submodule "vendor/grammars/NSIS"]
+	path = vendor/grammars/NSIS
+	url = https://github.com/SublimeText/NSIS
+[submodule "vendor/grammars/NimLime"]
+	path = vendor/grammars/NimLime
+	url = https://github.com/Varriount/NimLime
+[submodule "vendor/grammars/gradle.tmbundle"]
+	path = vendor/grammars/gradle.tmbundle
+	url = https://github.com/alkemist/gradle.tmbundle
+[submodule "vendor/grammars/Sublime-Loom"]
+	path = vendor/grammars/Sublime-Loom
+	url = https://github.com/ambethia/Sublime-Loom
+[submodule "vendor/grammars/VBDotNetSyntax"]
+	path = vendor/grammars/VBDotNetSyntax
+	url = https://github.com/angryant0007/VBDotNetSyntax
+[submodule "vendor/grammars/cool-tmbundle"]
+	path = vendor/grammars/cool-tmbundle
+	url = https://github.com/anunayk/cool-tmbundle
+[submodule "vendor/grammars/Docker.tmbundle"]
+	path = vendor/grammars/Docker.tmbundle
+	url = https://github.com/asbjornenge/Docker.tmbundle
+[submodule "vendor/grammars/jasmin-sublime"]
+	path = vendor/grammars/jasmin-sublime
+	url = https://github.com/atmarksharp/jasmin-sublime
+[submodule "vendor/grammars/language-clojure"]
+	path = vendor/grammars/language-clojure
+	url = https://github.com/atom/language-clojure
+[submodule "vendor/grammars/language-coffee-script"]
+	path = vendor/grammars/language-coffee-script
+	url = https://github.com/atom/language-coffee-script
+[submodule "vendor/grammars/language-csharp"]
+	path = vendor/grammars/language-csharp
+	url = https://github.com/atom/language-csharp
+[submodule "vendor/grammars/language-gfm"]
+	path = vendor/grammars/language-gfm
+	url = https://github.com/atom/language-gfm
+[submodule "vendor/grammars/language-javascript"]
+	path = vendor/grammars/language-javascript
+	url = https://github.com/atom/language-javascript
+[submodule "vendor/grammars/language-python"]
+	path = vendor/grammars/language-python
+	url = https://github.com/atom/language-python
+[submodule "vendor/grammars/language-shellscript"]
+	path = vendor/grammars/language-shellscript
+	url = https://github.com/atom/language-shellscript
+[submodule "vendor/grammars/language-supercollider"]
+	path = vendor/grammars/language-supercollider
+	url = https://github.com/supercollider/language-supercollider
+[submodule "vendor/grammars/language-yaml"]
+	path = vendor/grammars/language-yaml
+	url = https://github.com/atom/language-yaml
+[submodule "vendor/grammars/Sublime-Lasso"]
+	path = vendor/grammars/Sublime-Lasso
+	url = https://github.com/bfad/Sublime-Lasso
+[submodule "vendor/grammars/chapel-tmbundle"]
+	path = vendor/grammars/chapel-tmbundle
+	url = https://github.com/chapel-lang/chapel-tmbundle
+[submodule "vendor/grammars/sublime-nginx"]
+	path = vendor/grammars/sublime-nginx
+	url = https://github.com/brandonwamboldt/sublime-nginx
+[submodule "vendor/grammars/bro-sublime"]
+	path = vendor/grammars/bro-sublime
+	url = https://github.com/bro/bro-sublime
+[submodule "vendor/grammars/sublime_man_page_support"]
+	path = vendor/grammars/sublime_man_page_support
+	url = https://github.com/carsonoid/sublime_man_page_support
+[submodule "vendor/grammars/sublime-MuPAD"]
+	path = vendor/grammars/sublime-MuPAD
+	url = https://github.com/ccreutzig/sublime-MuPAD
+[submodule "vendor/grammars/haxe-sublime-bundle"]
+	path = vendor/grammars/haxe-sublime-bundle
+	url = https://github.com/clemos/haxe-sublime-bundle
+[submodule "vendor/grammars/cucumber-tmbundle"]
+	path = vendor/grammars/cucumber-tmbundle
+	url = https://github.com/cucumber/cucumber-tmbundle
+[submodule "vendor/grammars/powershell"]
+	path = vendor/grammars/powershell
+	url = https://github.com/SublimeText/PowerShell
+[submodule "vendor/grammars/jade-tmbundle"]
+	path = vendor/grammars/jade-tmbundle
+	url = https://github.com/davidrios/jade-tmbundle
+[submodule "vendor/grammars/elixir-tmbundle"]
+	path = vendor/grammars/elixir-tmbundle
+	url = https://github.com/elixir-lang/elixir-tmbundle
+[submodule "vendor/grammars/sublime-glsl"]
+	path = vendor/grammars/sublime-glsl
+	url = https://github.com/euler0/sublime-glsl
+[submodule "vendor/grammars/fancy-tmbundle"]
+	path = vendor/grammars/fancy-tmbundle
+	url = https://github.com/fancy-lang/fancy-tmbundle
+[submodule "vendor/grammars/dart-sublime-bundle"]
+	path = vendor/grammars/dart-sublime-bundle
+	url = https://github.com/guillermooo/dart-sublime-bundle
+[submodule "vendor/grammars/sublimetext-cuda-cpp"]
+	path = vendor/grammars/sublimetext-cuda-cpp
+	url = https://github.com/harrism/sublimetext-cuda-cpp
+[submodule "vendor/grammars/pike-textmate"]
+	path = vendor/grammars/pike-textmate
+	url = https://github.com/hww3/pike-textmate
+[submodule "vendor/grammars/ceylon-sublimetext"]
+	path = vendor/grammars/ceylon-sublimetext
+	url = https://github.com/jeancharles-roger/ceylon-sublimetext
+[submodule "vendor/grammars/Sublime-Text-2-OpenEdge-ABL"]
+	path = vendor/grammars/Sublime-Text-2-OpenEdge-ABL
+	url = https://github.com/jfairbank/Sublime-Text-2-OpenEdge-ABL
+[submodule "vendor/grammars/sublime-rust"]
+	path = vendor/grammars/sublime-rust
+	url = https://github.com/jhasse/sublime-rust
+[submodule "vendor/grammars/sublime-befunge"]
+	path = vendor/grammars/sublime-befunge
+	url = https://github.com/johanasplund/sublime-befunge
+[submodule "vendor/grammars/RDoc.tmbundle"]
+	path = vendor/grammars/RDoc.tmbundle
+	url = https://github.com/joshaven/RDoc.tmbundle
+[submodule "vendor/grammars/Textmate-Gosu-Bundle"]
+	path = vendor/grammars/Textmate-Gosu-Bundle
+	url = https://github.com/jpcamara/Textmate-Gosu-Bundle
+[submodule "vendor/grammars/fish-tmbundle"]
+	path = vendor/grammars/fish-tmbundle
+	url = https://github.com/l15n/fish-tmbundle
+[submodule "vendor/grammars/moonscript-tmbundle"]
+	path = vendor/grammars/moonscript-tmbundle
+	url = https://github.com/leafo/moonscript-tmbundle
+[submodule "vendor/grammars/Isabelle.tmbundle"]
+	path = vendor/grammars/Isabelle.tmbundle
+	url = https://github.com/lsf37/Isabelle.tmbundle
+[submodule "vendor/grammars/Alloy.tmbundle"]
+	path = vendor/grammars/Alloy.tmbundle
+	url = https://github.com/macekond/Alloy.tmbundle
+[submodule "vendor/grammars/opa.tmbundle"]
+	path = vendor/grammars/opa.tmbundle
+	url = https://github.com/mads379/opa.tmbundle
+[submodule "vendor/grammars/scala.tmbundle"]
+	path = vendor/grammars/scala.tmbundle
+	url = https://github.com/mads379/scala.tmbundle
+[submodule "vendor/grammars/mako-tmbundle"]
+	path = vendor/grammars/mako-tmbundle
+	url = https://github.com/marconi/mako-tmbundle
+[submodule "vendor/grammars/gnuplot-tmbundle"]
+	path = vendor/grammars/gnuplot-tmbundle
+	url = https://github.com/mattfoster/gnuplot-tmbundle
+[submodule "vendor/grammars/idl.tmbundle"]
+	path = vendor/grammars/idl.tmbundle
+	url = https://github.com/mgalloy/idl.tmbundle
+[submodule "vendor/grammars/protobuf-tmbundle"]
+	path = vendor/grammars/protobuf-tmbundle
+	url = https://github.com/michaeledgar/protobuf-tmbundle
+[submodule "vendor/grammars/Sublime-Coq"]
+	path = vendor/grammars/Sublime-Coq
+	url = https://github.com/mkolosick/Sublime-Coq
+[submodule "vendor/grammars/Agda.tmbundle"]
+	path = vendor/grammars/Agda.tmbundle
+	url = https://github.com/mokus0/Agda.tmbundle
+[submodule "vendor/grammars/Julia.tmbundle"]
+	path = vendor/grammars/Julia.tmbundle
+	url = https://github.com/nanoant/Julia.tmbundle
+[submodule "vendor/grammars/ooc.tmbundle"]
+	path = vendor/grammars/ooc.tmbundle
+	url = https://github.com/nilium/ooc.tmbundle
+[submodule "vendor/grammars/LiveScript.tmbundle"]
+	path = vendor/grammars/LiveScript.tmbundle
+	url = https://github.com/paulmillr/LiveScript.tmbundle
+[submodule "vendor/grammars/sublime-tea"]
+	path = vendor/grammars/sublime-tea
+	url = https://github.com/pferruggiaro/sublime-tea
+[submodule "vendor/grammars/abap.tmbundle"]
+	path = vendor/grammars/abap.tmbundle
+	url = https://github.com/pvl/abap.tmbundle
+[submodule "vendor/grammars/mercury-tmlanguage"]
+	path = vendor/grammars/mercury-tmlanguage
+	url = https://github.com/sebgod/mercury-tmlanguage
+[submodule "vendor/grammars/mathematica-tmbundle"]
+	path = vendor/grammars/mathematica-tmbundle
+	url = https://github.com/shadanan/mathematica-tmbundle
+[submodule "vendor/grammars/sublime-robot-plugin"]
+	path = vendor/grammars/sublime-robot-plugin
+	url = https://github.com/shellderp/sublime-robot-plugin
+[submodule "vendor/grammars/actionscript3-tmbundle"]
+	path = vendor/grammars/actionscript3-tmbundle
+	url = https://github.com/honzabrecka/actionscript3-tmbundle
+[submodule "vendor/grammars/Sublime-QML"]
+	path = vendor/grammars/Sublime-QML
+	url = https://github.com/skozlovf/Sublime-QML
+[submodule "vendor/grammars/Slash.tmbundle"]
+	path = vendor/grammars/Slash.tmbundle
+	url = https://github.com/slash-lang/Slash.tmbundle
+[submodule "vendor/grammars/factor"]
+	path = vendor/grammars/factor
+	url = https://github.com/slavapestov/factor
+[submodule "vendor/grammars/ruby-slim.tmbundle"]
+	path = vendor/grammars/ruby-slim.tmbundle
+	url = https://github.com/slim-template/ruby-slim.tmbundle
+[submodule "vendor/grammars/SublimeXtend"]
+	path = vendor/grammars/SublimeXtend
+	url = https://github.com/staltz/SublimeXtend
+[submodule "vendor/grammars/Vala-TMBundle"]
+	path = vendor/grammars/Vala-TMBundle
+	url = https://github.com/technosophos/Vala-TMBundle
+[submodule "vendor/grammars/ant.tmbundle"]
+	path = vendor/grammars/ant.tmbundle
+	url = https://github.com/textmate/ant.tmbundle
+[submodule "vendor/grammars/antlr.tmbundle"]
+	path = vendor/grammars/antlr.tmbundle
+	url = https://github.com/textmate/antlr.tmbundle
+[submodule "vendor/grammars/apache.tmbundle"]
+	path = vendor/grammars/apache.tmbundle
+	url = https://github.com/textmate/apache.tmbundle
+[submodule "vendor/grammars/applescript.tmbundle"]
+	path = vendor/grammars/applescript.tmbundle
+	url = https://github.com/textmate/applescript.tmbundle
+[submodule "vendor/grammars/asp.tmbundle"]
+	path = vendor/grammars/asp.tmbundle
+	url = https://github.com/textmate/asp.tmbundle
+[submodule "vendor/grammars/bison.tmbundle"]
+	path = vendor/grammars/bison.tmbundle
+	url = https://github.com/textmate/bison.tmbundle
+[submodule "vendor/grammars/capnproto.tmbundle"]
+	path = vendor/grammars/capnproto.tmbundle
+	url = https://github.com/textmate/capnproto.tmbundle
+[submodule "vendor/grammars/cmake.tmbundle"]
+	path = vendor/grammars/cmake.tmbundle
+	url = https://github.com/textmate/cmake.tmbundle
+[submodule "vendor/grammars/cpp-qt.tmbundle"]
+	path = vendor/grammars/cpp-qt.tmbundle
+	url = https://github.com/textmate/cpp-qt.tmbundle
+[submodule "vendor/grammars/css.tmbundle"]
+	path = vendor/grammars/css.tmbundle
+	url = https://github.com/textmate/css.tmbundle
+[submodule "vendor/grammars/d.tmbundle"]
+	path = vendor/grammars/d.tmbundle
+	url = https://github.com/textmate/d.tmbundle
+[submodule "vendor/grammars/diff.tmbundle"]
+	path = vendor/grammars/diff.tmbundle
+	url = https://github.com/textmate/diff.tmbundle
+[submodule "vendor/grammars/dylan.tmbundle"]
+	path = vendor/grammars/dylan.tmbundle
+	url = https://github.com/textmate/dylan.tmbundle
+[submodule "vendor/grammars/eiffel.tmbundle"]
+	path = vendor/grammars/eiffel.tmbundle
+	url = https://github.com/textmate/eiffel.tmbundle
+[submodule "vendor/grammars/erlang.tmbundle"]
+	path = vendor/grammars/erlang.tmbundle
+	url = https://github.com/textmate/erlang.tmbundle
+[submodule "vendor/grammars/fortran.tmbundle"]
+	path = vendor/grammars/fortran.tmbundle
+	url = https://github.com/textmate/fortran.tmbundle
+[submodule "vendor/grammars/gettext.tmbundle"]
+	path = vendor/grammars/gettext.tmbundle
+	url = https://github.com/textmate/gettext.tmbundle
+[submodule "vendor/grammars/graphviz.tmbundle"]
+	path = vendor/grammars/graphviz.tmbundle
+	url = https://github.com/textmate/graphviz.tmbundle
+[submodule "vendor/grammars/groovy.tmbundle"]
+	path = vendor/grammars/groovy.tmbundle
+	url = https://github.com/textmate/groovy.tmbundle
+[submodule "vendor/grammars/haskell.tmbundle"]
+	path = vendor/grammars/haskell.tmbundle
+	url = https://github.com/textmate/haskell.tmbundle
+[submodule "vendor/grammars/html.tmbundle"]
+	path = vendor/grammars/html.tmbundle
+	url = https://github.com/textmate/html.tmbundle
+[submodule "vendor/grammars/ini.tmbundle"]
+	path = vendor/grammars/ini.tmbundle
+	url = https://github.com/textmate/ini.tmbundle
+[submodule "vendor/grammars/desktop.tmbundle"]
+	path = vendor/grammars/desktop.tmbundle
+	url = https://github.com/Mailaender/desktop.tmbundle.git
+[submodule "vendor/grammars/io.tmbundle"]
+	path = vendor/grammars/io.tmbundle
+	url = https://github.com/textmate/io.tmbundle
+[submodule "vendor/grammars/java.tmbundle"]
+	path = vendor/grammars/java.tmbundle
+	url = https://github.com/textmate/java.tmbundle
+[submodule "vendor/grammars/javascript-objective-j.tmbundle"]
+	path = vendor/grammars/javascript-objective-j.tmbundle
+	url = https://github.com/textmate/javascript-objective-j.tmbundle
+[submodule "vendor/grammars/json.tmbundle"]
+	path = vendor/grammars/json.tmbundle
+	url = https://github.com/textmate/json.tmbundle
+[submodule "vendor/grammars/latex.tmbundle"]
+	path = vendor/grammars/latex.tmbundle
+	url = https://github.com/textmate/latex.tmbundle
+[submodule "vendor/grammars/lilypond.tmbundle"]
+	path = vendor/grammars/lilypond.tmbundle
+	url = https://github.com/textmate/lilypond.tmbundle
+[submodule "vendor/grammars/lisp.tmbundle"]
+	path = vendor/grammars/lisp.tmbundle
+	url = https://github.com/textmate/lisp.tmbundle
+[submodule "vendor/grammars/logtalk.tmbundle"]
+	path = vendor/grammars/logtalk.tmbundle
+	url = https://github.com/textmate/logtalk.tmbundle
+[submodule "vendor/grammars/lua.tmbundle"]
+	path = vendor/grammars/lua.tmbundle
+	url = https://github.com/textmate/lua.tmbundle
+[submodule "vendor/grammars/make.tmbundle"]
+	path = vendor/grammars/make.tmbundle
+	url = https://github.com/textmate/make.tmbundle
+[submodule "vendor/grammars/matlab.tmbundle"]
+	path = vendor/grammars/matlab.tmbundle
+	url = https://github.com/textmate/matlab.tmbundle
+[submodule "vendor/grammars/maven.tmbundle"]
+	path = vendor/grammars/maven.tmbundle
+	url = https://github.com/textmate/maven.tmbundle
+[submodule "vendor/grammars/nemerle.tmbundle"]
+	path = vendor/grammars/nemerle.tmbundle
+	url = https://github.com/textmate/nemerle.tmbundle
+[submodule "vendor/grammars/ninja.tmbundle"]
+	path = vendor/grammars/ninja.tmbundle
+	url = https://github.com/textmate/ninja.tmbundle
+[submodule "vendor/grammars/objective-c.tmbundle"]
+	path = vendor/grammars/objective-c.tmbundle
+	url = https://github.com/textmate/objective-c.tmbundle
+[submodule "vendor/grammars/ocaml.tmbundle"]
+	path = vendor/grammars/ocaml.tmbundle
+	url = https://github.com/textmate/ocaml.tmbundle
+[submodule "vendor/grammars/pascal.tmbundle"]
+	path = vendor/grammars/pascal.tmbundle
+	url = https://github.com/textmate/pascal.tmbundle
+[submodule "vendor/grammars/php-smarty.tmbundle"]
+	path = vendor/grammars/php-smarty.tmbundle
+	url = https://github.com/textmate/php-smarty.tmbundle
+[submodule "vendor/grammars/php.tmbundle"]
+	path = vendor/grammars/php.tmbundle
+	url = https://github.com/textmate/php.tmbundle
+[submodule "vendor/grammars/postscript.tmbundle"]
+	path = vendor/grammars/postscript.tmbundle
+	url = https://github.com/textmate/postscript.tmbundle
+[submodule "vendor/grammars/processing.tmbundle"]
+	path = vendor/grammars/processing.tmbundle
+	url = https://github.com/textmate/processing.tmbundle
+[submodule "vendor/grammars/python-django.tmbundle"]
+	path = vendor/grammars/python-django.tmbundle
+	url = https://github.com/textmate/python-django.tmbundle
+[submodule "vendor/grammars/r.tmbundle"]
+	path = vendor/grammars/r.tmbundle
+	url = https://github.com/textmate/r.tmbundle
+[submodule "vendor/grammars/restructuredtext.tmbundle"]
+	path = vendor/grammars/restructuredtext.tmbundle
+	url = https://github.com/textmate/restructuredtext.tmbundle
+[submodule "vendor/grammars/ruby-haml.tmbundle"]
+	path = vendor/grammars/ruby-haml.tmbundle
+	url = https://github.com/textmate/ruby-haml.tmbundle
+[submodule "vendor/grammars/scheme.tmbundle"]
+	path = vendor/grammars/scheme.tmbundle
+	url = https://github.com/textmate/scheme.tmbundle
+[submodule "vendor/grammars/scilab.tmbundle"]
+	path = vendor/grammars/scilab.tmbundle
+	url = https://github.com/textmate/scilab.tmbundle
+[submodule "vendor/grammars/sql.tmbundle"]
+	path = vendor/grammars/sql.tmbundle
+	url = https://github.com/textmate/sql.tmbundle
+[submodule "vendor/grammars/standard-ml.tmbundle"]
+	path = vendor/grammars/standard-ml.tmbundle
+	url = https://github.com/textmate/standard-ml.tmbundle
+[submodule "vendor/grammars/swift.tmbundle"]
+	path = vendor/grammars/swift.tmbundle
+	url = https://github.com/textmate/swift.tmbundle
+[submodule "vendor/grammars/tcl.tmbundle"]
+	path = vendor/grammars/tcl.tmbundle
+	url = https://github.com/textmate/tcl.tmbundle
+[submodule "vendor/grammars/thrift.tmbundle"]
+	path = vendor/grammars/thrift.tmbundle
+	url = https://github.com/textmate/thrift.tmbundle
+[submodule "vendor/grammars/toml.tmbundle"]
+	path = vendor/grammars/toml.tmbundle
+	url = https://github.com/textmate/toml.tmbundle
+[submodule "vendor/grammars/verilog.tmbundle"]
+	path = vendor/grammars/verilog.tmbundle
+	url = https://github.com/textmate/verilog.tmbundle
+[submodule "vendor/grammars/xml.tmbundle"]
+	path = vendor/grammars/xml.tmbundle
+	url = https://github.com/textmate/xml.tmbundle
+[submodule "vendor/grammars/smalltalk-tmbundle"]
+	path = vendor/grammars/smalltalk-tmbundle
+	url = https://github.com/tomas-stefano/smalltalk-tmbundle
+[submodule "vendor/grammars/ioke-outdated"]
+	path = vendor/grammars/ioke-outdated
+	url = https://github.com/vic/ioke-outdated
+[submodule "vendor/grammars/kotlin-sublime-package"]
+	path = vendor/grammars/kotlin-sublime-package
+	url = https://github.com/vkostyukov/kotlin-sublime-package
+[submodule "vendor/grammars/c.tmbundle"]
+	path = vendor/grammars/c.tmbundle
+	url = https://github.com/textmate/c.tmbundle
+[submodule "vendor/grammars/zephir-sublime"]
+	path = vendor/grammars/zephir-sublime
+	url = https://github.com/vmg/zephir-sublime
+[submodule "vendor/grammars/llvm.tmbundle"]
+	path = vendor/grammars/llvm.tmbundle
+	url = https://github.com/whitequark/llvm.tmbundle
+[submodule "vendor/grammars/oz-tmbundle"]
+	path = vendor/grammars/oz-tmbundle
+	url = https://github.com/eregon/oz-tmbundle
+[submodule "vendor/grammars/ebundles"]
+	path = vendor/grammars/ebundles
+	url = https://github.com/ericzou/ebundles
+[submodule "vendor/grammars/sublime-mask"]
+	path = vendor/grammars/sublime-mask
+	url = https://github.com/tenbits/sublime-mask
+[submodule "vendor/grammars/sublime_cobol"]
+	path = vendor/grammars/sublime_cobol
+	url = https://bitbucket.org/bitlang/sublime_cobol
+[submodule "vendor/grammars/ruby.tmbundle"]
+	path = vendor/grammars/ruby.tmbundle
+	url = https://github.com/aroben/ruby.tmbundle
+	branch = pl
+[submodule "vendor/grammars/IDL-Syntax"]
+	path = vendor/grammars/IDL-Syntax
+	url = https://github.com/andik/IDL-Syntax
+[submodule "vendor/grammars/sas.tmbundle"]
+	path = vendor/grammars/sas.tmbundle
+	url = https://github.com/rpardee/sas.tmbundle
+[submodule "vendor/grammars/atom-salt"]
+	path = vendor/grammars/atom-salt
+	url = https://github.com/saltstack/atom-salt
+[submodule "vendor/grammars/Scalate.tmbundle"]
+	path = vendor/grammars/Scalate.tmbundle
+	url = https://github.com/scalate/Scalate.tmbundle
+[submodule "vendor/grammars/Elm.tmLanguage"]
+	path = vendor/grammars/Elm.tmLanguage
+	url = https://github.com/deadfoxygrandpa/Elm.tmLanguage
+[submodule "vendor/grammars/sublime-bsv"]
+	path = vendor/grammars/sublime-bsv
+	url = https://github.com/thotypous/sublime-bsv
+[submodule "vendor/grammars/Sublime-HTTP"]
+	path = vendor/grammars/Sublime-HTTP
+	url = https://github.com/httpspec/sublime-highlighting
+[submodule "vendor/grammars/sass-textmate-bundle"]
+	path = vendor/grammars/sass-textmate-bundle
+	url = https://github.com/nathos/sass-textmate-bundle
+[submodule "vendor/grammars/carto-atom"]
+	path = vendor/grammars/carto-atom
+	url = https://github.com/yohanboniface/carto-atom
+[submodule "vendor/grammars/Sublime-Nit"]
+	path = vendor/grammars/Sublime-Nit
+	url = https://github.com/R4PaSs/Sublime-Nit
+[submodule "vendor/grammars/language-hy"]
+	path = vendor/grammars/language-hy
+	url = https://github.com/rwtolbert/language-hy
+[submodule "vendor/grammars/Racket"]
+	path = vendor/grammars/Racket
+	url = https://github.com/soegaard/racket-highlight-for-github
+[submodule "vendor/grammars/turtle.tmbundle"]
+	path = vendor/grammars/turtle.tmbundle
+	url = https://github.com/peta/turtle.tmbundle
+[submodule "vendor/grammars/liquid.tmbundle"]
+	path = vendor/grammars/liquid.tmbundle
+	url = https://github.com/bastilian/validcode-textmate-bundles
+[submodule "vendor/grammars/Modelica"]
+	path = vendor/grammars/Modelica
+	url = https://github.com/BorisChumichev/modelicaSublimeTextPackage
+[submodule "vendor/grammars/sublime-apl"]
+	path = vendor/grammars/sublime-apl
+	url = https://github.com/StoneCypher/sublime-apl
+[submodule "vendor/grammars/sublime-golo"]
+	path = vendor/grammars/sublime-golo
+	url = https://github.com/TypeUnsafe/sublime-golo
+[submodule "vendor/grammars/JSyntax"]
+	path = vendor/grammars/JSyntax
+	url = https://github.com/bcj/JSyntax
+[submodule "vendor/grammars/TXL"]
+	path = vendor/grammars/TXL
+	url = https://github.com/MikeHoffert/Sublime-Text-TXL-syntax
+[submodule "vendor/grammars/G-Code"]
+	path = vendor/grammars/G-Code
+	url = https://github.com/robotmaster/sublime-text-syntax-highlighting
+[submodule "vendor/grammars/sublime-text-ox"]
+	path = vendor/grammars/sublime-text-ox
+	url = https://github.com/andreashetland/sublime-text-ox
+[submodule "vendor/grammars/AutoHotkey"]
+	path = vendor/grammars/AutoHotkey
+	url = https://github.com/ahkscript/SublimeAutoHotkey
+[submodule "vendor/grammars/ec.tmbundle"]
+	path = vendor/grammars/ec.tmbundle
+	url = https://github.com/ecere/ec.tmbundle
+[submodule "vendor/grammars/gap-tmbundle"]
+	path = vendor/grammars/gap-tmbundle
+	url = https://github.com/dhowden/gap-tmbundle
+[submodule "vendor/grammars/SublimePapyrus"]
+	path = vendor/grammars/SublimePapyrus
+	url = https://github.com/Kapiainen/SublimePapyrus
+[submodule "vendor/grammars/sublime-spintools"]
+	path = vendor/grammars/sublime-spintools
+	url = https://github.com/bitbased/sublime-spintools
+[submodule "vendor/grammars/PogoScript.tmbundle"]
+	path = vendor/grammars/PogoScript.tmbundle
+	url = https://github.com/featurist/PogoScript.tmbundle
+[submodule "vendor/grammars/sublime-opal"]
+	path = vendor/grammars/sublime-opal
+	url = https://github.com/artifactz/sublime-opal
+[submodule "vendor/grammars/mediawiki.tmbundle"]
+	path = vendor/grammars/mediawiki.tmbundle
+	url = https://github.com/textmate/mediawiki.tmbundle
+[submodule "vendor/grammars/SublimeClarion"]
+	path = vendor/grammars/SublimeClarion
+	url = https://github.com/fushnisoft/SublimeClarion
+[submodule "vendor/grammars/BrightScript.tmbundle"]
+	path = vendor/grammars/BrightScript.tmbundle
+	url = https://github.com/cmink/BrightScript.tmbundle
+[submodule "vendor/grammars/Stylus"]
+	path = vendor/grammars/Stylus
+	url = https://github.com/billymoon/Stylus
+[submodule "vendor/grammars/asciidoc.tmbundle"]
+	path = vendor/grammars/asciidoc.tmbundle
+	url = https://github.com/zuckschwerdt/asciidoc.tmbundle
+[submodule "vendor/grammars/Lean.tmbundle"]
+	path = vendor/grammars/Lean.tmbundle
+	url = https://github.com/leanprover/Lean.tmbundle
+[submodule "vendor/grammars/ampl"]
+	path = vendor/grammars/ampl
+	url = https://github.com/ampl/sublime-ampl
+[submodule "vendor/grammars/sublime-varnish"]
+	path = vendor/grammars/sublime-varnish
+	url = https://github.com/brandonwamboldt/sublime-varnish
+[submodule "vendor/grammars/xc.tmbundle"]
+	path = vendor/grammars/xc.tmbundle
+	url = https://github.com/graymalkin/xc.tmbundle
+[submodule "vendor/grammars/perl.tmbundle"]
+	path = vendor/grammars/perl.tmbundle
+	url = https://github.com/textmate/perl.tmbundle
+[submodule "vendor/grammars/sublime-netlinx"]
+	path = vendor/grammars/sublime-netlinx
+	url = https://github.com/amclain/sublime-netlinx
+[submodule "vendor/grammars/Sublime-Red"]
+	path = vendor/grammars/Sublime-Red
+	url = https://github.com/Oldes/Sublime-Red
+[submodule "vendor/grammars/jflex.tmbundle"]
+	path = vendor/grammars/jflex.tmbundle
+	url = https://github.com/jflex-de/jflex.tmbundle.git
+[submodule "vendor/grammars/Sublime-Modula-2"]
+	path = vendor/grammars/Sublime-Modula-2
+	url = https://github.com/harogaston/Sublime-Modula-2
+[submodule "vendor/grammars/ada.tmbundle"]
+	path = vendor/grammars/ada.tmbundle
+	url = https://github.com/textmate/ada.tmbundle
+[submodule "vendor/grammars/api-blueprint-sublime-plugin"]
+	path = vendor/grammars/api-blueprint-sublime-plugin
+	url = https://github.com/apiaryio/api-blueprint-sublime-plugin
+[submodule "vendor/grammars/Handlebars"]
+	path = vendor/grammars/Handlebars
+	url = https://github.com/daaain/Handlebars
+[submodule "vendor/grammars/smali-sublime"]
+	path = vendor/grammars/smali-sublime
+	url = https://github.com/ShaneWilton/sublime-smali
+[submodule "vendor/grammars/language-jsoniq"]
+	path = vendor/grammars/language-jsoniq
+	url = http://github.com/wcandillon/language-jsoniq
+[submodule "vendor/grammars/atom-fsharp"]
+	path = vendor/grammars/atom-fsharp
+	url = https://github.com/fsprojects/atom-fsharp
+[submodule "vendor/grammars/SMT.tmbundle"]
+	path = vendor/grammars/SMT.tmbundle
+	url = https://github.com/SRI-CSL/SMT.tmbundle.git
+[submodule "vendor/grammars/language-crystal"]
+	path = vendor/grammars/language-crystal
+	url = https://github.com/atom-crystal/language-crystal
+[submodule "vendor/grammars/language-xbase"]
+	path = vendor/grammars/language-xbase
+	url = https://github.com/hernad/atom-language-harbour
+[submodule "vendor/grammars/language-ncl"]
+	path = vendor/grammars/language-ncl
+	url = https://github.com/rpavlick/language-ncl.git
+[submodule "vendor/grammars/pawn-sublime-language"]
+	path = vendor/grammars/pawn-sublime-language
+	url = https://github.com/Southclaw/pawn-sublime-language.git
+[submodule "vendor/grammars/atom-language-purescript"]
+	path = vendor/grammars/atom-language-purescript
+	url = https://github.com/purescript-contrib/atom-language-purescript
+[submodule "vendor/grammars/vue-syntax-highlight"]
+	path = vendor/grammars/vue-syntax-highlight
+	url = https://github.com/vuejs/vue-syntax-highlight
+[submodule "vendor/grammars/st2-zonefile"]
+	path = vendor/grammars/st2-zonefile
+	url = https://github.com/sixty4k/st2-zonefile
+[submodule "vendor/grammars/sublimeprolog"]
+	path = vendor/grammars/sublimeprolog
+	url = https://github.com/alnkpa/sublimeprolog
+[submodule "vendor/grammars/sublime-aspectj"]
+	path = vendor/grammars/sublime-aspectj
+	url = https://github.com/pchaigno/sublime-aspectj
+[submodule "vendor/grammars/sublime-typescript"]
+	path = vendor/grammars/sublime-typescript
+	url = https://github.com/Microsoft/TypeScript-Sublime-Plugin
+[submodule "vendor/grammars/sublime-pony"]
+	path = vendor/grammars/sublime-pony
+	url = https://github.com/CausalityLtd/sublime-pony
+[submodule "vendor/grammars/X10"]
+	path = vendor/grammars/X10
+	url = https://github.com/x10-lang/x10-highlighting
+[submodule "vendor/grammars/language-babel"]
+	path = vendor/grammars/language-babel
+	url = https://github.com/gandm/language-babel
+[submodule "vendor/grammars/UrWeb-Language-Definition"]
+	path = vendor/grammars/UrWeb-Language-Definition
+	url = https://github.com/gwalborn/UrWeb-Language-Definition.git
+[submodule "vendor/grammars/Stata.tmbundle"]
+	path = vendor/grammars/Stata.tmbundle
+	url = https://github.com/pschumm/Stata.tmbundle
+[submodule "vendor/grammars/FreeMarker.tmbundle"]
+	path = vendor/grammars/FreeMarker.tmbundle
+	url = https://github.com/freemarker/FreeMarker.tmbundle
+[submodule "vendor/grammars/MagicPython"]
+	path = vendor/grammars/MagicPython
+	url = https://github.com/MagicStack/MagicPython
+[submodule "vendor/grammars/language-click"]
+	path = vendor/grammars/language-click
+	url = https://github.com/stenverbois/language-click.git
+[submodule "vendor/grammars/language-maxscript"]
+	path = vendor/grammars/language-maxscript
+	url = https://github.com/Alhadis/language-maxscript
+[submodule "vendor/grammars/language-renpy"]
+	path = vendor/grammars/language-renpy
+	url = https://github.com/williamd1k0/language-renpy.git
+[submodule "vendor/grammars/language-inform7"]
+	path = vendor/grammars/language-inform7
+	url = https://github.com/erkyrath/language-inform7
+[submodule "vendor/grammars/atom-language-stan"]
+	path = vendor/grammars/atom-language-stan
+	url = https://github.com/jrnold/atom-language-stan
+[submodule "vendor/grammars/language-yang"]
+	path = vendor/grammars/language-yang
+	url = https://github.com/DzonyKalafut/language-yang.git
+[submodule "vendor/grammars/perl6fe"]
+	path = vendor/grammars/perl6fe
+	url = https://github.com/MadcapJake/language-perl6fe.git
+[submodule "vendor/grammars/language-less"]
+	path = vendor/grammars/language-less
+	url = https://github.com/atom/language-less.git
+[submodule "vendor/grammars/language-povray"]
+	path = vendor/grammars/language-povray
+	url = https://github.com/c-lipka/language-povray
+[submodule "vendor/grammars/sublime-terra"]
+	path = vendor/grammars/sublime-terra
+	url = https://github.com/pyk/sublime-terra
+[submodule "vendor/grammars/SublimePuppet"]
+	path = vendor/grammars/SublimePuppet
+	url = https://github.com/russCloak/SublimePuppet
+[submodule "vendor/grammars/sublimeassembly"]
+	path = vendor/grammars/sublimeassembly
+	url = https://github.com/Nessphoro/sublimeassembly
+[submodule "vendor/grammars/monkey"]
+	path = vendor/grammars/monkey
+	url = https://github.com/gingerbeardman/monkey.tmbundle
+[submodule "vendor/grammars/assembly"]
+	path = vendor/grammars/assembly
+	url = https://github.com/nanoant/assembly.tmbundle
+[submodule "vendor/grammars/boo"]
+	path = vendor/grammars/boo
+	url = https://github.com/Shammah/boo-sublime
+[submodule "vendor/grammars/logos"]
+	path = vendor/grammars/logos
+	url = https://github.com/Cykey/Sublime-Logos
+[submodule "vendor/grammars/pig-latin"]
+	path = vendor/grammars/pig-latin
+	url = https://github.com/goblindegook/sublime-text-pig-latin
+[submodule "vendor/grammars/sourcepawn"]
+	path = vendor/grammars/sourcepawn
+	url = https://github.com/austinwagner/sublime-sourcepawn
+[submodule "vendor/grammars/gdscript"]
+	path = vendor/grammars/gdscript
+	url = https://github.com/beefsack/GDScript-sublime
+[submodule "vendor/grammars/nesC"]
+	path = vendor/grammars/nesC
+	url = https://github.com/cdwilson/nesC.tmbundle
+[submodule "vendor/grammars/ats"]
+	path = vendor/grammars/ats
+	url = https://github.com/steinwaywhw/ats-mode-sublimetext
+[submodule "vendor/grammars/grace"]
+	path = vendor/grammars/grace
+	url = https://github.com/zmthy/grace-tmbundle
+[submodule "vendor/grammars/nix"]
+	path = vendor/grammars/nix
+	url = https://github.com/wmertens/sublime-nix
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,17 @@
-before_install: 
-  - sudo apt-get install libicu-dev -y
-  - gem update --system 2.1.11
+language: ruby
+sudo: false
+addons:
+  apt:
+    packages:
+    - libicu-dev
+    - libicu48
+before_install: script/travis/before_install
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
  - 2.0.0
-  - 2.1.1
-  - ree
+  - 2.1
+  - 2.2
 notifications:
  disabled: true
+git:
+  submodules: false
+cache: bundler
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,105 @@
+# Contributing
+
+[code-of-conduct]: http://todogroup.org/opencodeofconduct/#Linguist/opensource@github.com
+
+Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great. This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to uphold this code.
+
+The majority of contributions won't need to touch any Ruby code at all.
+
+## Adding an extension to a language
+
+We try only to add new extensions once they have some usage on GitHub. In most cases we prefer that extensions be in use in hundreds of repositories before supporting them in Linguist.
+
+To add support for a new extension:
+
+0. Add your extension to the language entry in [`languages.yml`][languages], keeping the extensions in alphabetical order.
+0. Add at least one sample for your extension to the [samples directory][samples] in the correct subdirectory.
+0. Open a pull request, linking to a [GitHub search result](https://github.com/search?utf8=%E2%9C%93&q=extension%3Aboot+NOT+nothack&type=Code&ref=searchresults) showing in-the-wild usage.
+
+In addition, if this extension is already listed in [`languages.yml`][languages] then sometimes a few more steps will need to be taken:
+
+0. Make sure that example `.yourextension` files are present in the [samples directory][samples] for each language that uses `.yourextension`.
+0. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.yourextension` files. (ping @arfon or @bkeepers to help with this) to ensure we're not misclassifying files.
+0. If the Bayesian classifier does a bad job with the sample `.yourextension` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.
+
+
+## Adding a language
+
+We try only to add languages once they have some usage on GitHub. In most cases we prefer that each new file extension be in use in hundreds of repositories before supporting them in Linguist.
+
+To add support for a new language:
+
+0. Add an entry for your language to [`languages.yml`][languages].
+0. Add a grammar for your language. Please only add grammars that have a license that permits redistribution.
+  0. Add your grammar as a submodule: `git submodule add https://github.com/JaneSmith/MyGrammar vendor/grammars/MyGrammar`.
+  0. Add your grammar to [`grammars.yml`][grammars] by running `script/convert-grammars --add vendor/grammars/MyGrammar`.
+0. Add samples for your language to the [samples directory][samples] in the correct subdirectory.
+0. Open a pull request, linking to a [GitHub search result](https://github.com/search?utf8=%E2%9C%93&q=extension%3Aboot+NOT+nothack&type=Code&ref=searchresults) showing in-the-wild usage.
+
+In addition, if your new language defines an extension that's already listed in [`languages.yml`][languages] (such as `.foo`) then sometimes a few more steps will need to be taken:
+
+0. Make sure that example `.foo` files are present in the [samples directory][samples] for each language that uses `.foo`.
+0. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.foo` files. (ping @arfon or @bkeepers to help with this) to ensure we're not misclassifying files.
+0. If the Bayesian classifier does a bad job with the sample `.foo` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.
+
+Remember, the goal here is to try and avoid false positives!
+
+
+## Fixing a misclassified language
+
+Most languages are detected by their file extension defined in [languages.yml][languages].  For disambiguating between files with common extensions, linguist applies some [heuristics](/lib/linguist/heuristics.rb) and a [statistical classifier](lib/linguist/classifier.rb). This process can help differentiate between, for example, `.h` files which could be either C, C++, or Obj-C.
+
+Misclassifications can often be solved by either adding a new filename or extension for the language or adding more [samples][samples] to make the classifier smarter.
+
+
+## Fixing syntax highlighting
+
+Syntax highlighting in GitHub is performed using TextMate-compatible grammars. These are the same grammars that TextMate, Sublime Text and Atom use. Every language in [languages.yml][languages] is mapped to its corresponding TM `scope`. This scope will be used when picking up a grammar for highlighting.
+
+Assuming your code is being detected as the right language, in most cases this is due to a bug in the language grammar rather than a bug in Linguist. [`grammars.yml`][grammars] lists all the grammars we use for syntax highlighting on github.com. Find the one corresponding to your code's programming language and submit a bug report upstream. If you can, try to reproduce the highlighting problem in the text editor that the grammar is designed for (TextMate, Sublime Text, or Atom) and include that information in your bug report.
+
+You can also try to fix the bug yourself and submit a Pull Request. [TextMate's documentation](https://manual.macromates.com/en/language_grammars) offers a good introduction on how to work with TextMate-compatible grammars. You can test grammars using [Lightshow](https://github-lightshow.herokuapp.com).
+
+Once the bug has been fixed upstream, we'll pick it up for GitHub in the next release of Linguist.
+
+## Testing
+
+For development you are going to want to checkout out the source. To get it, clone the repo and run [Bundler](http://gembundler.com/) to install its dependencies.
+
+    git clone https://github.com/github/linguist.git
+    cd linguist/
+    script/bootstrap
+
+To run the tests:
+
+    bundle exec rake test
+
+Sometimes getting the tests running can be too much work, especially if you don't have much Ruby experience. It's okay: be lazy and let our build bot [Travis](https://travis-ci.org/#!/github/linguist) run the tests for you. Just open a pull request and the bot will start cranking away.
+
+Here's our current build status: [![Build Status](https://api.travis-ci.org/github/linguist.svg?branch=master)](https://travis-ci.org/github/linguist)
+
+
+## Releasing
+
+If you are the current maintainer of this gem:
+
+0. Create a branch for the release: `git checkout -b cut-release-vxx.xx.xx`
+0. Make sure your local dependencies are up to date: `script/bootstrap`
+0. If grammar submodules have not been updated recently, update them: `git submodule update --remote && git commit -a`
+0. Ensure that samples are updated: `bundle exec rake samples`
+0. Ensure that tests are green: `bundle exec rake test`
+0. Bump gem version in `lib/linguist/version.rb`, [like this](https://github.com/github/linguist/commit/8d2ea90a5ba3b2fe6e1508b7155aa4632eea2985).
+0. Make a PR to github/linguist, [like this](https://github.com/github/linguist/pull/1238).
+0. Build a local gem: `bundle exec rake build_gem`
+0. Test the gem:
+  0. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
+  0. Install the new gem locally
+  0. Test behavior locally, branch deploy, whatever needs to happen
+0. Merge github/linguist PR
+0. Tag and push: `git tag vx.xx.xx; git push --tags`
+0. Push to rubygems.org -- `gem push github-linguist-3.0.0.gem`
+
+[grammars]: /grammars.yml
+[languages]: /lib/linguist/languages.yml
+[samples]: /samples
+[new-issue]: https://github.com/github/linguist/issues/new
--- a/8
+++ b/8
@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
-gemspec
-
-if RUBY_VERSION < "1.9.3"
-  # escape_utils 1.0.0 requires 1.9.3 and above
-  gem "escape_utils", "0.3.2"
-end
+gemspec :name => "github-linguist"
+gem 'byebug' if RUBY_VERSION >= '2.0'
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2014 GitHub, Inc.
+Copyright (c) 2011-2016 GitHub, Inc.

 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
--- a/README.md
+++ b/README.md
@@ -1,113 +1,122 @@
 # Linguist

-We use this library at GitHub to detect blob languages, highlight code, ignore binary files, suppress generated files in diffs, and generate language breakdown graphs.
+[issues]: https://github.com/github/linguist/issues
+[new-issue]: https://github.com/github/linguist/issues/new

-## Features
+This library is used on GitHub.com to detect blob languages, ignore binary or vendored files, suppress generated files in diffs, and generate language breakdown graphs.

-### Language detection
+See [Troubleshooting](#troubleshooting) and [`CONTRIBUTING.md`](/CONTRIBUTING.md) before filing an issue or creating a pull request.

-Linguist defines a list of all languages known to GitHub in a [yaml file](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml). In order for a file to be highlighted, a language and a lexer must be defined there.
+## Troubleshooting

-Most languages are detected by their file extension. For disambiguating between files with common extensions, we first apply some common-sense heuristics to pick out obvious languages. After that, we use a
-[statistical
-classifier](https://github.com/github/linguist/blob/master/lib/linguist/classifier.rb).
-This process can help us tell the difference between, for example, `.h` files which could be either C, C++, or Obj-C.
+### My repository is detected as the wrong language

-```ruby
+![language stats bar](https://cloud.githubusercontent.com/assets/173/5562290/48e24654-8ddf-11e4-8fe7-735b0ce3a0d3.png)

-Linguist::FileBlob.new("lib/linguist.rb").language.name #=> "Ruby"
+The Language stats bar displays languages percentages for the files in the repository. The percentages are calculated based on the bytes of code for each language as reported by the [List Languages](https://developer.github.com/v3/repos/#list-languages) API. If the bar is reporting a language that you don't expect:

-Linguist::FileBlob.new("bin/linguist").language.name #=> "Ruby"
+0. Click on the name of the language in the stats bar to see a list of the files that are identified as that language.
+0. If you see files that you didn't write, consider moving the files into one of the [paths for vendored  code](/lib/linguist/vendor.yml), or use the [manual overrides](#overrides) feature to ignore them.
+0. If the files are being misclassified, search for [open issues][issues] to see if anyone else has already reported the issue. Any information you can add, especially links to public repositories, is helpful.
+0. If there are no reported issues of this misclassification, [open an issue][new-issue] and include a link to the repository or a sample of the code that is being misclassified.
+
+## Overrides
+
+Linguist supports a number of different custom overrides strategies for language definitions and vendored paths.
+
+### Using gitattributes
+
+Add a `.gitattributes` file to your project and use standard git-style path matchers for the files you want to override to set `linguist-documentation`, `linguist-language`, and `linguist-vendored`. `.gitattributes` will be used to determine language statistics, but will not be used to syntax highlight files. To manually set syntax highlighting, use [Vim or Emacs modelines](#using-emacs-or-vim-modelines).
+
+```
+$ cat .gitattributes
+*.rb linguist-language=Java
 ```

-See [lib/linguist/language.rb](https://github.com/github/linguist/blob/master/lib/linguist/language.rb) and [lib/linguist/languages.yml](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml).
+Checking code you didn't write, such as JavaScript libraries, into your git repo is a common practice, but this often inflates your project's language stats and may even cause your project to be labeled as another language. By default, Linguist treats all of the paths defined in [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml) as vendored and therefore doesn't include them in the language statistics for a repository.

-### Syntax Highlighting
+Use the `linguist-vendored` attribute to vendor or un-vendor paths.

-The actual syntax highlighting is handled by our Pygments wrapper, [pygments.rb](https://github.com/tmm1/pygments.rb). It also provides a [Lexer abstraction](https://github.com/tmm1/pygments.rb/blob/master/lib/pygments/lexer.rb) that determines which highlighter should be used on a file.
-
-### Stats
-
-The Language stats bar that you see on every repository is built by aggregating the languages of each file in that repository. The top language in the graph determines the project's primary language.
-
-The repository stats API, accessed through `#languages`, can be used on a directory:
-
-```ruby
-project = Linguist::Repository.from_directory(".")
-project.language.name  #=> "Ruby"
-project.languages      #=> { "Ruby" => 0.98, "Shell" => 0.02 }
+```
+$ cat .gitattributes
+special-vendored-path/* linguist-vendored
+jquery.js linguist-vendored=false
 ```

-These stats are also printed out by the `linguist` binary. You can use the
+Similar to vendored files, Linguist excludes documentation files from your project's language stats. (Unlike vendored files, documentation files are displayed in diffs on github.com.) [lib/linguist/documentation.yml](lib/linguist/documentation.yml) lists common documentation paths and excludes them from the language statistics for your repository.
+
+Use the `linguist-documentation` attribute to mark or unmark paths as documentation.
+
+```
+$ cat .gitattributes
+project-docs/* linguist-documentation
+docs/formatter.rb linguist-documentation=false
+```
+
+### Using Emacs or Vim modelines
+
+Alternatively, you can use Vim or Emacs style modelines to set the language for a single file. Modelines can be placed anywhere within a file and are respected when determining how to syntax-highlight a file on GitHub.com
+
+##### Vim
+```
+# Some examples of various styles:
+vim: syntax=java
+vim: set syntax=ruby:
+vim: set filetype=prolog:
+vim: set ft=cpp:
+```
+
+##### Emacs
+```
+-*- mode: php;-*-
+```
+
+## Usage
+
+Install the gem:
+
+```
+$ gem install github-linguist
+```
+
+Then use it in your application:
+
+```ruby
+require 'rugged'
+require 'linguist'
+
+repo = Rugged::Repository.new('.')
+project = Linguist::Repository.new(repo, repo.head.target_id)
+project.language       #=> "Ruby"
+project.languages      #=> { "Ruby" => 119387 }
+```
+
+These stats are also printed out by the `linguist` executable. You can use the
 `--breakdown` flag, and the binary will also output the breakdown of files by language.

-You can try running `linguist` on the `lib/` directory in this repository itself:
+You can try running `linguist` on the root directory in this repository itself:

-    $ bundle exec linguist lib/ --breakdown
-
-    100.00% Ruby
-
-    Ruby:
-    linguist/blob_helper.rb
-    linguist/classifier.rb
-    linguist/file_blob.rb
-    linguist/generated.rb
-    linguist/heuristics.rb
-    linguist/language.rb
-    linguist/md5.rb
-    linguist/repository.rb
-    linguist/samples.rb
-    linguist/tokenizer.rb
-    linguist.rb
-
-#### Ignore vendored files
-
-Checking other code into your git repo is a common practice. But this often inflates your project's language stats and may even cause your project to be labeled as another language. We are able to identify some of these files and directories and exclude them.
-
-```ruby
-Linguist::FileBlob.new("vendor/plugins/foo.rb").vendored? # => true
 ```
+$ bundle exec linguist --breakdown

-See [Linguist::BlobHelper#vendored?](https://github.com/github/linguist/blob/master/lib/linguist/blob_helper.rb) and [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml).
+100.00% Ruby

-#### Generated file detection
-
-Not all plain text files are true source files. Generated files like minified js and compiled CoffeeScript can be detected and excluded from language stats. As an extra bonus, these files are suppressed in diffs.
-
-```ruby
-Linguist::FileBlob.new("underscore.min.js").generated? # => true
+Ruby:
+Gemfile
+Rakefile
+bin/linguist
+github-linguist.gemspec
+lib/linguist.rb
+…
 ```

-See [Linguist::Generated#generated?](https://github.com/github/linguist/blob/master/lib/linguist/generated.rb).
-
-## Installation
-
-github.com is usually running the latest version of the `github-linguist` gem that is released on [RubyGems.org](http://rubygems.org/gems/github-linguist).
-
-But for development you are going to want to checkout out the source. To get it, clone the repo and run [Bundler](http://gembundler.com/) to install its dependencies.
-
-    git clone https://github.com/github/linguist.git
-    cd linguist/
-    bundle install
-
-To run the tests:
-
-    bundle exec rake test
-
 ## Contributing

-The majority of contributions won't need to touch any Ruby code at all. The [master language list](https://github.com/github/linguist/blob/master/lib/linguist/languages.yml) is just a YAML configuration file.
+Please check out our [contributing guidelines](CONTRIBUTING.md).

-We try to only add languages once they have some usage on GitHub, so please note in-the-wild usage examples in your pull request.
+## License

-Almost all bug fixes or new language additions should come with some additional code samples. Just drop them under [`samples/`](https://github.com/github/linguist/tree/master/samples) in the correct subdirectory and our test suite will automatically test them. In most cases you shouldn't need to add any new assertions.
+The language grammars included in this gem are covered by their repositories'
+respective licenses. `grammars.yml` specifies the repository for each grammar.

-To update the `samples.json` after adding new files to [`samples/`](https://github.com/github/linguist/tree/master/samples):
-
-    bundle exec rake samples
-
-### Testing
-
-Sometimes getting the tests running can be too much work, especially if you don't have much Ruby experience. It's okay: be lazy and let our build bot [Travis](http://travis-ci.org/#!/github/linguist) run the tests for you. Just open a pull request and the bot will start cranking away.
-
-Here's our current build status, which is hopefully green: [![Build Status](https://secure.travis-ci.org/github/linguist.png?branch=master)](http://travis-ci.org/github/linguist)
+All other files are covered by the MIT license, see `LICENSE`.
--- a/118
+++ b/118
@@ -1,27 +1,114 @@
-require 'json'
+require 'bundler/setup'
 require 'rake/clean'
 require 'rake/testtask'
 require 'yaml'
+require 'yajl'
+require 'open-uri'

 task :default => :test

 Rake::TestTask.new

-task :samples do
-  require 'linguist/samples'
-  require 'yajl'
-  data = Linguist::Samples.data
-  json = Yajl::Encoder.encode(data, :pretty => true)
-  File.open('lib/linguist/samples.json', 'w') { |io| io.write json }
+# Extend test task to check for samples and fetch latest Ace modes
+task :test => [:check_samples, :fetch_ace_modes]
+
+desc "Check that we have samples.json generated"
+task :check_samples do
+  unless File.exist?('lib/linguist/samples.json')
+    Rake::Task[:samples].invoke
+  end
 end

-task :build_gem do
+desc "Fetch the latest Ace modes from its GitHub repository"
+task :fetch_ace_modes do
+  ACE_FIXTURE_PATH = File.join('test', 'fixtures', 'ace_modes.json')
+
+  File.delete(ACE_FIXTURE_PATH) if File.exist?(ACE_FIXTURE_PATH)
+
+  begin
+    ace_github_modes = open("https://api.github.com/repos/ajaxorg/ace/contents/lib/ace/mode").read
+    File.write(ACE_FIXTURE_PATH, ace_github_modes)
+  rescue OpenURI::HTTPError, SocketError
+      # no internet? no problem.
+  end
+end
+
+task :samples do
+  require 'linguist/samples'
+  json = Yajl.dump(Linguist::Samples.data, :pretty => true)
+  File.write 'lib/linguist/samples.json', json
+end
+
+task :build_gem => :samples do
+  rm_rf "grammars"
+  sh "script/convert-grammars"
  languages = YAML.load_file("lib/linguist/languages.yml")
-  File.write("lib/linguist/languages.json", JSON.dump(languages))
+  File.write("lib/linguist/languages.json", Yajl.dump(languages))
  `gem build github-linguist.gemspec`
  File.delete("lib/linguist/languages.json")
 end

+namespace :benchmark do
+  benchmark_path = "benchmark/results"
+
+  # $ bundle exec rake benchmark:generate CORPUS=path/to/samples
+  desc "Generate results for"
+  task :generate do
+    ref = `git rev-parse HEAD`.strip[0,8]
+
+    corpus = File.expand_path(ENV["CORPUS"] || "samples")
+
+    require 'linguist'
+
+    results = Hash.new
+    Dir.glob("#{corpus}/**/*").each do |file|
+      next unless File.file?(file)
+      filename = file.gsub("#{corpus}/", "")
+      results[filename] = Linguist::FileBlob.new(file).language
+    end
+
+    # Ensure results directory exists
+    FileUtils.mkdir_p("benchmark/results")
+
+    # Write results
+    if `git status`.include?('working directory clean')
+      result_filename = "benchmark/results/#{File.basename(corpus)}-#{ref}.json"
+    else
+      result_filename = "benchmark/results/#{File.basename(corpus)}-#{ref}-unstaged.json"
+    end
+
+    File.write(result_filename, results.to_json)
+    puts "wrote #{result_filename}"
+  end
+
+  # $ bundle exec rake benchmark:compare REFERENCE=path/to/reference.json CANDIDATE=path/to/candidate.json
+  desc "Compare results"
+  task :compare do
+    reference_file = ENV["REFERENCE"]
+    candidate_file = ENV["CANDIDATE"]
+
+    reference = Yajl.load(File.read(reference_file))
+    reference_counts = Hash.new(0)
+    reference.each { |filename, language| reference_counts[language] += 1 }
+
+    candidate = Yajl.load(File.read(candidate_file))
+    candidate_counts = Hash.new(0)
+    candidate.each { |filename, language| candidate_counts[language] += 1 }
+
+    changes = diff(reference_counts, candidate_counts)
+
+    if changes.any?
+      changes.each do |language, (before, after)|
+        before_percent = 100 * before / reference.size.to_f
+        after_percent = 100 * after / candidate.size.to_f
+        puts "%s changed from %.1f%% to %.1f%%" % [language || 'unknown', before_percent, after_percent]
+      end
+    else
+      puts "No changes"
+    end
+  end
+end
+
 namespace :classifier do
  LIMIT = 1_000

@@ -37,7 +124,7 @@ namespace :classifier do
      next if file_language.nil? || file_language == 'Text'
      begin
        data = open(file_url).read
-        guessed_language, score = Linguist::Classifier.classify(Linguist::Samples::DATA, data).first
+        guessed_language, score = Linguist::Classifier.classify(Linguist::Samples.cache, data).first

        total += 1
        guessed_language == file_language ? correct += 1 : incorrect += 1
@@ -54,14 +141,12 @@ namespace :classifier do

  def each_public_gist
    require 'open-uri'
-    require 'json'
-
    url = "https://api.github.com/gists/public"

    loop do
      resp = open(url)
      url = resp.meta['link'][/<([^>]+)>; rel="next"/, 1]
-      gists = JSON.parse(resp.read)
+      gists = Yajl.load(resp.read)

      for gist in gists
        for filename, attrs in gist['files']
@@ -71,3 +156,10 @@ namespace :classifier do
    end
  end
 end
+
+
+def diff(a, b)
+  (a.keys | b.keys).each_with_object({}) do |key, diff|
+    diff[key] = [a[key], b[key]] unless a[key] == b[key]
+  end
+end
--- a/bin/git-linguist
+++ b/bin/git-linguist
@@ -0,0 +1,138 @@
+#!/usr/bin/env ruby
+
+require 'linguist'
+require 'rugged'
+require 'optparse'
+require 'json'
+require 'tmpdir'
+require 'zlib'
+
+class GitLinguist
+  def initialize(path, commit_oid, incremental = true)
+    @repo_path = path
+    @commit_oid = commit_oid
+    @incremental = incremental
+  end
+
+  def linguist
+    if @commit_oid.nil?
+      raise "git-linguist must be called with a specific commit OID to perform language computation"
+    end
+    repo = Linguist::Repository.new(rugged, @commit_oid)
+
+    if @incremental && stats = load_language_stats
+      old_commit_oid, old_stats = stats
+
+      # A cache with NULL oid means that we want to froze
+      # these language stats in place and stop computing
+      # them (for performance reasons)
+      return old_stats if old_commit_oid == NULL_OID
+      repo.load_existing_stats(old_commit_oid, old_stats)
+    end
+
+    result = yield repo
+
+    save_language_stats(@commit_oid, repo.cache)
+    result
+  end
+
+  def load_language_stats
+    version, oid, stats = load_cache
+    if version == LANGUAGE_STATS_CACHE_VERSION && oid && stats
+      [oid, stats]
+    end
+  end
+
+  def save_language_stats(oid, stats)
+    cache = [LANGUAGE_STATS_CACHE_VERSION, oid, stats]
+    write_cache(cache)
+  end
+
+  def clear_language_stats
+    File.unlink(cache_file)
+  rescue Errno::ENOENT
+  end
+
+  def disable_language_stats
+    save_language_stats(NULL_OID, {})
+  end
+
+  protected
+  NULL_OID = ("0" * 40).freeze
+
+  LANGUAGE_STATS_CACHE = 'language-stats.cache'
+  LANGUAGE_STATS_CACHE_VERSION = "v3:#{Linguist::VERSION}"
+
+  def rugged
+    @rugged ||= Rugged::Repository.bare(@repo_path)
+  end
+
+  def cache_file
+    File.join(@repo_path, LANGUAGE_STATS_CACHE)
+  end
+
+  def write_cache(object)
+    return unless File.directory? @repo_path
+
+    begin
+      tmp_path = Dir::Tmpname.make_tmpname(cache_file, nil)
+      File.open(tmp_path, "wb") do |f|
+        marshal = Marshal.dump(object)
+        f.write(Zlib::Deflate.deflate(marshal))
+      end
+
+      File.rename(tmp_path, cache_file)
+    rescue => e
+      (File.unlink(tmp_path) rescue nil)
+      raise e
+    end
+  end
+
+  def load_cache
+    marshal = File.open(cache_file, "rb") { |f| Zlib::Inflate.inflate(f.read) }
+    Marshal.load(marshal)
+  rescue SystemCallError, ::Zlib::DataError, ::Zlib::BufError, TypeError
+    nil
+  end
+end
+
+
+def git_linguist(args)
+  incremental = true
+  commit = nil
+
+  parser = OptionParser.new do |opts|
+    opts.banner = "Usage: git-linguist [OPTIONS] stats|breakdown|dump-cache|clear|disable"
+
+    opts.on("-f", "--force", "Force a full rescan") { incremental = false }
+    opts.on("--commit=COMMIT", "Commit to index") { |v| commit = v}
+  end
+
+  parser.parse!(args)
+
+  git_dir = `git rev-parse --git-dir`.strip
+  raise "git-linguist must be ran in a Git repository (#{Dir.pwd})" unless $?.success?
+  wrapper = GitLinguist.new(git_dir, commit, incremental)
+
+  case args.pop
+  when "stats"
+    wrapper.linguist do |linguist|
+      puts JSON.dump(linguist.languages)
+    end
+  when "breakdown"
+    wrapper.linguist do |linguist|
+      puts JSON.dump(linguist.breakdown_by_file)
+    end
+  when "dump-cache"
+    puts JSON.dump(wrapper.load_language_stats)
+  when "clear"
+    wrapper.clear_language_stats
+  when "disable"
+    wrapper.disable_language_stats
+  else
+    $stderr.print(parser.help)
+    exit 1
+  end
+end
+
+git_linguist(ARGV)
--- a/bin/linguist
+++ b/bin/linguist
@@ -2,9 +2,9 @@

 # linguist — detect language type for a file, or, given a directory, determine language breakdown
 #     usage: linguist <path> [<--breakdown>]
-
-require 'linguist/file_blob'
-require 'linguist/repository'
+#
+require 'linguist'
+require 'rugged'

 path = ARGV[0] || Dir.pwd

@@ -18,7 +18,8 @@ ARGV.shift
 breakdown = true if ARGV[0] == "--breakdown"

 if File.directory?(path)
-  repo = Linguist::Repository.from_directory(path)
+  rugged = Rugged::Repository.new(path)
+  repo = Linguist::Repository.new(rugged, rugged.head.target_id)
  repo.languages.sort_by { |_, size| size }.reverse.each do |language, size|
    percentage = ((size / repo.size.to_f) * 100)
    percentage = sprintf '%.2f' % percentage
@@ -28,7 +29,7 @@ if File.directory?(path)
    puts
    file_breakdown = repo.breakdown_by_file
    file_breakdown.each do |lang, files|
-      puts "#{lang}:" 
+      puts "#{lang}:"
      files.each do |file|
        puts file
      end
--- a/github-linguist.gemspec
+++ b/github-linguist.gemspec
@@ -10,16 +10,21 @@ Gem::Specification.new do |s|
  s.homepage = "https://github.com/github/linguist"
  s.license  = "MIT"

-  s.files = Dir['lib/**/*']
-  s.executables << 'linguist'
+  s.files = Dir['lib/**/*'] + Dir['grammars/*'] + ['LICENSE']
+  s.executables = ['linguist', 'git-linguist']

-  s.add_dependency 'charlock_holmes', '~> 0.6.6'
-  s.add_dependency 'escape_utils',    '>= 0.3.1'
-  s.add_dependency 'mime-types',      '~> 1.19'
-  s.add_dependency 'pygments.rb',     '~> 0.5.4'
+  s.add_dependency 'charlock_holmes', '~> 0.7.3'
+  s.add_dependency 'escape_utils',    '~> 1.1.0'
+  s.add_dependency 'mime-types',      '>= 1.19'
+  s.add_dependency 'rugged',          '>= 0.23.0b'

-  s.add_development_dependency 'json'
+  s.add_development_dependency 'minitest', '>= 5.0'
  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'plist', '~>3.1'
+  s.add_development_dependency 'pry'
  s.add_development_dependency 'rake'
  s.add_development_dependency 'yajl-ruby'
+  s.add_development_dependency 'color-proximity', '~> 0.2.1'
+  s.add_development_dependency 'licensed'
+
 end
--- a/grammars.yml
+++ b/grammars.yml
@@ -0,0 +1,586 @@
+---
+http://svn.edgewall.org/repos/genshi/contrib/textmate/Genshi.tmbundle/Syntaxes/Markup%20Template%20%28XML%29.tmLanguage:
+- text.xml.genshi
+http://svn.textmate.org/trunk/Review/Bundles/BlitzMax.tmbundle:
+- source.blitzmax
+http://svn.textmate.org/trunk/Review/Bundles/Cython.tmbundle:
+- source.cython
+http://svn.textmate.org/trunk/Review/Bundles/Forth.tmbundle:
+- source.forth
+http://svn.textmate.org/trunk/Review/Bundles/Parrot.tmbundle:
+- source.parrot.pir
+http://svn.textmate.org/trunk/Review/Bundles/SecondLife%20LSL.tmbundle:
+- source.lsl
+http://svn.textmate.org/trunk/Review/Bundles/VHDL.tmbundle:
+- source.vhdl
+http://svn.textmate.org/trunk/Review/Bundles/XQuery.tmbundle:
+- source.xquery
+https://bitbucket.org/Clams/sublimesystemverilog/get/default.tar.gz:
+- source.systemverilog
+- source.ucfconstraints
+https://fan.googlecode.com/hg-history/Build%201.0.55/adm/tools/textmate/Fan.tmbundle/Syntaxes/Fan.tmLanguage:
+- source.fan
+vendor/grammars/Agda.tmbundle:
+- source.agda
+vendor/grammars/Alloy.tmbundle:
+- source.alloy
+vendor/grammars/AutoHotkey/:
+- source.ahk
+vendor/grammars/BrightScript.tmbundle/:
+- source.brightauthorproject
+- source.brightscript
+vendor/grammars/ColdFusion:
+- source.cfscript
+- source.cfscript.cfc
+- text.cfml.basic
+- text.html.cfm
+vendor/grammars/Docker.tmbundle:
+- source.dockerfile
+vendor/grammars/Elm.tmLanguage:
+- source.elm
+vendor/grammars/FreeMarker.tmbundle:
+- text.html.ftl
+vendor/grammars/G-Code/:
+- source.LS
+- source.MCPOST
+- source.MOD
+- source.apt
+- source.gcode
+vendor/grammars/Handlebars:
+- text.html.handlebars
+vendor/grammars/IDL-Syntax:
+- source.webidl
+vendor/grammars/Isabelle.tmbundle:
+- source.isabelle.root
+- source.isabelle.theory
+vendor/grammars/JSyntax/:
+- source.j
+vendor/grammars/Julia.tmbundle:
+- source.julia
+vendor/grammars/Lean.tmbundle:
+- source.lean
+vendor/grammars/LiveScript.tmbundle:
+- source.livescript
+vendor/grammars/MagicPython:
+- source.python
+- source.regexp.python
+vendor/grammars/Modelica/:
+- source.modelica
+vendor/grammars/NSIS:
+- source.nsis
+vendor/grammars/NimLime:
+- source.nim
+- source.nim_filter
+- source.nimcfg
+vendor/grammars/PHP-Twig.tmbundle:
+- text.html.twig
+vendor/grammars/PogoScript.tmbundle/:
+- source.pogoscript
+vendor/grammars/RDoc.tmbundle:
+- text.rdoc
+vendor/grammars/Racket:
+- source.racket
+vendor/grammars/SCSS.tmbundle:
+- source.scss
+vendor/grammars/SMT.tmbundle:
+- source.smt
+vendor/grammars/Scalate.tmbundle:
+- source.scaml
+- text.html.ssp
+vendor/grammars/Slash.tmbundle:
+- text.html.slash
+vendor/grammars/Stata.tmbundle/:
+- source.mata
+- source.stata
+vendor/grammars/Stylus/:
+- source.stylus
+vendor/grammars/Sublime-Coq:
+- source.coq
+vendor/grammars/Sublime-HTTP:
+- source.httpspec
+vendor/grammars/Sublime-Lasso:
+- file.lasso
+vendor/grammars/Sublime-Loom:
+- source.loomscript
+vendor/grammars/Sublime-Modula-2/:
+- source.modula2
+vendor/grammars/Sublime-Nit:
+- source.nit
+vendor/grammars/Sublime-QML:
+- source.qml
+vendor/grammars/Sublime-REBOL:
+- source.rebol
+vendor/grammars/Sublime-Red:
+- source.red
+vendor/grammars/Sublime-SQF-Language:
+- source.sqf
+vendor/grammars/Sublime-Text-2-OpenEdge-ABL:
+- source.abl
+- text.html.abl
+vendor/grammars/Sublime-VimL:
+- source.viml
+vendor/grammars/SublimeBrainfuck:
+- source.bf
+vendor/grammars/SublimeClarion/:
+- source.clarion
+vendor/grammars/SublimePapyrus/:
+- source.papyrus.skyrim
+vendor/grammars/SublimePuppet/:
+- source.puppet
+vendor/grammars/SublimeXtend:
+- source.xtend
+vendor/grammars/TXL/:
+- source.txl
+vendor/grammars/Textmate-Gosu-Bundle:
+- source.gosu.2
+vendor/grammars/UrWeb-Language-Definition:
+- source.ur
+vendor/grammars/VBDotNetSyntax:
+- source.vbnet
+vendor/grammars/Vala-TMBundle:
+- source.vala
+vendor/grammars/X10:
+- source.x10
+vendor/grammars/abap.tmbundle:
+- source.abap
+vendor/grammars/actionscript3-tmbundle:
+- source.actionscript.3
+- text.html.asdoc
+- text.xml.flex-config
+vendor/grammars/ada.tmbundle:
+- source.ada
+vendor/grammars/ampl:
+- source.ampl
+vendor/grammars/ant.tmbundle:
+- text.xml.ant
+vendor/grammars/antlr.tmbundle:
+- source.antlr
+vendor/grammars/apache.tmbundle:
+- source.apache-config
+- source.apache-config.mod_perl
+vendor/grammars/api-blueprint-sublime-plugin/:
+- text.html.markdown.source.gfm.apib
+- text.html.markdown.source.gfm.mson
+vendor/grammars/applescript.tmbundle:
+- source.applescript
+vendor/grammars/asciidoc.tmbundle/:
+- text.html.asciidoc
+vendor/grammars/asp.tmbundle:
+- source.asp
+- text.html.asp
+vendor/grammars/assembly/:
+- objdump.x86asm
+- source.x86asm
+vendor/grammars/atom-fsharp/:
+- source.fsharp
+- source.fsharp.fsi
+- source.fsharp.fsl
+- source.fsharp.fsx
+vendor/grammars/atom-language-purescript/:
+- source.purescript
+vendor/grammars/atom-language-stan/:
+- source.stan
+vendor/grammars/atom-salt:
+- source.python.salt
+- source.yaml.salt
+vendor/grammars/ats:
+- source.ats
+vendor/grammars/awk-sublime:
+- source.awk
+vendor/grammars/bison.tmbundle:
+- source.bison
+vendor/grammars/boo/:
+- source.boo
+vendor/grammars/bro-sublime:
+- source.bro
+vendor/grammars/c.tmbundle:
+- source.c
+- source.c++
+- source.c.platform
+vendor/grammars/capnproto.tmbundle:
+- source.capnp
+vendor/grammars/carto-atom:
+- source.css.mss
+vendor/grammars/ceylon-sublimetext:
+- module.ceylon
+- source.ceylon
+vendor/grammars/chapel-tmbundle:
+- source.chapel
+vendor/grammars/cmake.tmbundle:
+- source.cache.cmake
+- source.cmake
+vendor/grammars/cool-tmbundle:
+- source.cool
+vendor/grammars/cpp-qt.tmbundle:
+- source.c++.qt
+- source.qmake
+vendor/grammars/css.tmbundle:
+- source.css
+vendor/grammars/cucumber-tmbundle:
+- source.ruby.rspec.cucumber.steps
+- text.gherkin.feature
+vendor/grammars/d.tmbundle:
+- source.d
+vendor/grammars/dart-sublime-bundle:
+- source.dart
+- source.pubspec
+- text.dart-analysis-output
+- text.dart-doccomments
+vendor/grammars/desktop.tmbundle:
+- source.desktop
+vendor/grammars/diff.tmbundle:
+- source.diff
+vendor/grammars/dylan.tmbundle:
+- source.dylan
+- source.lid
+- source.makegen
+vendor/grammars/ebundles/Bundles/MSDOS batch file.tmbundle:
+- source.dosbatch
+vendor/grammars/ec.tmbundle/:
+- source.c.ec
+vendor/grammars/eiffel.tmbundle:
+- source.eiffel
+vendor/grammars/elixir-tmbundle:
+- source.elixir
+- text.elixir
+- text.html.elixir
+vendor/grammars/erlang.tmbundle:
+- source.erlang
+- text.html.erlang.yaws
+vendor/grammars/factor:
+- source.factor
+- text.html.factor
+vendor/grammars/fancy-tmbundle:
+- source.fancy
+vendor/grammars/fish-tmbundle:
+- source.fish
+vendor/grammars/fortran.tmbundle:
+- source.fortran
+- source.fortran.modern
+vendor/grammars/gap-tmbundle/:
+- source.gap
+vendor/grammars/gdscript/:
+- source.gdscript
+vendor/grammars/gettext.tmbundle:
+- source.po
+vendor/grammars/gnuplot-tmbundle:
+- source.gnuplot
+vendor/grammars/go-tmbundle:
+- source.go
+vendor/grammars/grace:
+- source.grace
+vendor/grammars/gradle.tmbundle:
+- source.groovy.gradle
+vendor/grammars/graphviz.tmbundle:
+- source.dot
+vendor/grammars/groovy.tmbundle:
+- source.groovy
+vendor/grammars/haskell.tmbundle:
+- source.haskell
+- text.tex.latex.haskell
+vendor/grammars/haxe-sublime-bundle:
+- source.erazor
+- source.haxe.2
+- source.hss.1
+- source.hxml
+- source.nmml
+vendor/grammars/html.tmbundle:
+- text.html.basic
+vendor/grammars/idl.tmbundle:
+- source.idl
+- source.idl-dlm
+- text.idl-idldoc
+vendor/grammars/ini.tmbundle:
+- source.ini
+vendor/grammars/io.tmbundle:
+- source.io
+vendor/grammars/ioke-outdated:
+- source.ioke
+vendor/grammars/jade-tmbundle:
+- source.pyjade
+- text.jade
+vendor/grammars/jasmin-sublime:
+- source.jasmin
+vendor/grammars/java.tmbundle:
+- source.java
+- source.java-properties
+- text.html.jsp
+- text.junit-test-report
+vendor/grammars/javascript-objective-j.tmbundle:
+- source.js.objj
+vendor/grammars/jflex.tmbundle:
+- source.jflex
+vendor/grammars/json.tmbundle:
+- source.json
+vendor/grammars/kotlin-sublime-package:
+- source.Kotlin
+vendor/grammars/language-babel/:
+- source.js.jsx
+- source.regexp.babel
+vendor/grammars/language-click/:
+- source.click
+vendor/grammars/language-clojure:
+- source.clojure
+vendor/grammars/language-coffee-script:
+- source.coffee
+- source.litcoffee
+vendor/grammars/language-crystal:
+- source.crystal
+vendor/grammars/language-csharp:
+- source.cake
+- source.cs
+- source.csx
+- source.nant-build
+vendor/grammars/language-gfm:
+- source.gfm
+vendor/grammars/language-hy:
+- source.hy
+vendor/grammars/language-inform7:
+- source.inform7
+vendor/grammars/language-javascript:
+- source.js
+- source.js.regexp
+- source.js.regexp.replacement
+vendor/grammars/language-jsoniq/:
+- source.jq
+- source.xq
+vendor/grammars/language-less/:
+- source.css.less
+vendor/grammars/language-maxscript:
+- source.maxscript
+vendor/grammars/language-ncl:
+- source.ncl
+vendor/grammars/language-povray:
+- source.pov-ray sdl
+vendor/grammars/language-python:
+- text.python.console
+- text.python.traceback
+vendor/grammars/language-renpy:
+- source.renpy
+vendor/grammars/language-shellscript:
+- source.shell
+- text.shell-session
+vendor/grammars/language-supercollider:
+- source.supercollider
+vendor/grammars/language-xbase:
+- source.harbour
+vendor/grammars/language-yaml:
+- source.yaml
+vendor/grammars/language-yang/:
+- source.yang
+vendor/grammars/latex.tmbundle:
+- text.bibtex
+- text.log.latex
+- text.tex
+- text.tex.latex
+- text.tex.latex.beamer
+- text.tex.latex.memoir
+vendor/grammars/lilypond.tmbundle:
+- source.lilypond
+vendor/grammars/liquid.tmbundle:
+- text.html.liquid
+vendor/grammars/lisp.tmbundle:
+- source.lisp
+vendor/grammars/llvm.tmbundle:
+- source.llvm
+vendor/grammars/logos:
+- source.logos
+vendor/grammars/logtalk.tmbundle:
+- source.logtalk
+vendor/grammars/lua.tmbundle:
+- source.lua
+vendor/grammars/make.tmbundle:
+- source.makefile
+vendor/grammars/mako-tmbundle:
+- text.html.mako
+vendor/grammars/mathematica-tmbundle:
+- source.mathematica
+vendor/grammars/matlab.tmbundle:
+- source.matlab
+- source.octave
+vendor/grammars/maven.tmbundle:
+- text.xml.pom
+vendor/grammars/mediawiki.tmbundle/:
+- text.html.mediawiki
+vendor/grammars/mercury-tmlanguage:
+- source.mercury
+vendor/grammars/monkey/:
+- source.monkey
+vendor/grammars/moonscript-tmbundle:
+- source.moonscript
+vendor/grammars/nemerle.tmbundle:
+- source.nemerle
+vendor/grammars/nesC:
+- source.nesc
+vendor/grammars/ninja.tmbundle:
+- source.ninja
+vendor/grammars/nix:
+- source.nix
+vendor/grammars/objective-c.tmbundle:
+- source.objc
+- source.objc++
+- source.objc.platform
+- source.strings
+vendor/grammars/ocaml.tmbundle:
+- source.camlp4.ocaml
+- source.ocaml
+- source.ocamllex
+- source.ocamlyacc
+vendor/grammars/ooc.tmbundle:
+- source.ooc
+vendor/grammars/opa.tmbundle:
+- source.opa
+vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage:
+- source.oz
+vendor/grammars/pascal.tmbundle:
+- source.pascal
+vendor/grammars/pawn-sublime-language/:
+- source.pawn
+vendor/grammars/perl.tmbundle/:
+- source.perl
+- source.perl.6
+vendor/grammars/perl6fe:
+- source.meta-info
+- source.perl6fe
+- source.regexp.perl6fe
+vendor/grammars/php-smarty.tmbundle:
+- text.html.smarty
+vendor/grammars/php.tmbundle:
+- text.html.php
+vendor/grammars/pig-latin/:
+- source.pig_latin
+vendor/grammars/pike-textmate:
+- source.pike
+vendor/grammars/postscript.tmbundle:
+- source.postscript
+vendor/grammars/powershell:
+- source.powershell
+vendor/grammars/processing.tmbundle:
+- source.processing
+vendor/grammars/protobuf-tmbundle:
+- source.protobuf
+vendor/grammars/python-django.tmbundle:
+- source.python.django
+- text.html.django
+vendor/grammars/r.tmbundle:
+- source.r
+- text.tex.latex.rd
+vendor/grammars/restructuredtext.tmbundle:
+- text.restructuredtext
+vendor/grammars/ruby-haml.tmbundle:
+- text.haml
+vendor/grammars/ruby-slim.tmbundle:
+- text.slim
+vendor/grammars/ruby.tmbundle:
+- source.ruby
+- text.html.erb
+vendor/grammars/sas.tmbundle:
+- source.sas
+- source.sas_log
+vendor/grammars/sass-textmate-bundle:
+- source.sass
+vendor/grammars/scala.tmbundle:
+- source.sbt
+- source.scala
+vendor/grammars/scheme.tmbundle:
+- source.scheme
+vendor/grammars/scilab.tmbundle:
+- source.scilab
+vendor/grammars/smali-sublime/smali.tmLanguage:
+- source.smali
+vendor/grammars/smalltalk-tmbundle:
+- source.smalltalk
+vendor/grammars/sourcepawn/:
+- source.sp
+vendor/grammars/sql.tmbundle:
+- source.sql
+vendor/grammars/st2-zonefile:
+- text.zone_file
+vendor/grammars/standard-ml.tmbundle:
+- source.cm
+- source.ml
+vendor/grammars/sublime-MuPAD:
+- source.mupad
+vendor/grammars/sublime-apl/:
+- source.apl
+vendor/grammars/sublime-aspectj/:
+- source.aspectj
+vendor/grammars/sublime-befunge:
+- source.befunge
+vendor/grammars/sublime-bsv:
+- source.bsv
+vendor/grammars/sublime-cirru:
+- source.cirru
+vendor/grammars/sublime-glsl:
+- source.essl
+- source.glsl
+vendor/grammars/sublime-golo/:
+- source.golo
+vendor/grammars/sublime-mask:
+- source.mask
+vendor/grammars/sublime-netlinx:
+- source.netlinx
+- source.netlinx.erb
+vendor/grammars/sublime-nginx:
+- source.nginx
+vendor/grammars/sublime-opal/:
+- source.opal
+- source.opalsysdefs
+vendor/grammars/sublime-pony:
+- source.pony
+vendor/grammars/sublime-robot-plugin:
+- text.robot
+vendor/grammars/sublime-rust:
+- source.rust
+vendor/grammars/sublime-spintools/:
+- source.regexp.spin
+- source.spin
+vendor/grammars/sublime-tea:
+- source.tea
+vendor/grammars/sublime-terra:
+- source.terra
+vendor/grammars/sublime-text-ox/:
+- source.ox
+vendor/grammars/sublime-typescript/:
+- source.ts
+- source.tsx
+vendor/grammars/sublime-varnish:
+- source.varnish.vcl
+vendor/grammars/sublime_cobol:
+- source.acucobol
+- source.cobol
+- source.jcl
+- source.opencobol
+vendor/grammars/sublime_man_page_support:
+- source.man
+- text.groff
+vendor/grammars/sublimeassembly/:
+- source.assembly
+vendor/grammars/sublimeprolog/:
+- source.prolog
+- source.prolog.eclipse
+vendor/grammars/sublimetext-cuda-cpp:
+- source.cuda-c++
+vendor/grammars/swift.tmbundle:
+- source.swift
+vendor/grammars/tcl.tmbundle:
+- source.tcl
+- text.html.tcl
+vendor/grammars/thrift.tmbundle:
+- source.thrift
+vendor/grammars/toml.tmbundle:
+- source.toml
+vendor/grammars/turtle.tmbundle:
+- source.sparql
+- source.turtle
+vendor/grammars/verilog.tmbundle:
+- source.verilog
+vendor/grammars/vue-syntax-highlight:
+- text.html.vue
+vendor/grammars/xc.tmbundle/:
+- source.xc
+vendor/grammars/xml.tmbundle:
+- text.xml
+- text.xml.xsl
+vendor/grammars/zephir-sublime:
+- source.php.zephir
--- a/lib/linguist.rb
+++ b/lib/linguist.rb
@@ -1,7 +1,99 @@
 require 'linguist/blob_helper'
 require 'linguist/generated'
+require 'linguist/grammars'
 require 'linguist/heuristics'
 require 'linguist/language'
 require 'linguist/repository'
 require 'linguist/samples'
+require 'linguist/shebang'
 require 'linguist/version'
+
+class << Linguist
+  # Public: Detects the Language of the blob.
+  #
+  # blob - an object that includes the Linguist `BlobHelper` interface;
+  #       see Linguist::LazyBlob and Linguist::FileBlob for examples
+  #
+  # Returns Language or nil.
+  def detect(blob)
+    # Bail early if the blob is binary or empty.
+    return nil if blob.likely_binary? || blob.binary? || blob.empty?
+
+    Linguist.instrument("linguist.detection", :blob => blob) do
+      # Call each strategy until one candidate is returned.
+      languages = []
+      returning_strategy = nil
+
+      STRATEGIES.each do |strategy|
+        returning_strategy = strategy
+        candidates = Linguist.instrument("linguist.strategy", :blob => blob, :strategy => strategy, :candidates => languages) do
+          strategy.call(blob, languages)
+        end
+        if candidates.size == 1
+          languages = candidates
+          break
+        elsif candidates.size > 1
+          # More than one candidate was found, pass them to the next strategy.
+          languages = candidates
+        else
+          # No candidates, try the next strategy
+        end
+      end
+
+      Linguist.instrument("linguist.detected", :blob => blob, :strategy => returning_strategy, :language => languages.first)
+
+      languages.first
+    end
+  end
+
+  # Internal: The strategies used to detect the language of a file.
+  #
+  # A strategy is an object that has a `.call` method that takes two arguments:
+  #
+  #   blob - An object that quacks like a blob.
+  #   languages - An Array of candidate Language objects that were returned by the
+  #               previous strategy.
+  #
+  # A strategy should return an Array of Language candidates.
+  #
+  # Strategies are called in turn until a single Language is returned.
+  STRATEGIES = [
+    Linguist::Strategy::Modeline,
+    Linguist::Shebang,
+    Linguist::Strategy::Filename,
+    Linguist::Heuristics,
+    Linguist::Classifier
+  ]
+
+  # Public: Set an instrumenter.
+  #
+  #     class CustomInstrumenter
+  #       def instrument(name, payload = {})
+  #         warn "Instrumenting #{name}: #{payload[:blob]}"
+  #       end
+  #     end
+  #
+  #     Linguist.instrumenter = CustomInstrumenter
+  #
+  # The instrumenter must conform to the `ActiveSupport::Notifications`
+  # interface, which defines `#instrument` and accepts:
+  #
+  # name    - the String name of the event (e.g. "linguist.detected")
+  # payload - a Hash of the exception context.
+  attr_accessor :instrumenter
+
+  # Internal: Perform instrumentation on a block
+  #
+  #     Linguist.instrument("linguist.dosomething", :blob => blob) do
+  #       # logic to instrument here.
+  #     end
+  #
+  def instrument(*args, &bk)
+    if instrumenter
+      instrumenter.instrument(*args, &bk)
+    elsif block_given?
+      yield
+    end
+  end
+
+end
--- a/lib/linguist/blob.rb
+++ b/lib/linguist/blob.rb
@@ -0,0 +1,73 @@
+require 'linguist/blob_helper'
+
+module Linguist
+  # A Blob is a wrapper around the content of a file to make it quack
+  # like a Grit::Blob. It provides the basic interface: `name`,
+  # `data`, `path` and `size`.
+  class Blob
+    include BlobHelper
+
+    # Public: Initialize a new Blob.
+    #
+    # path    - A path String (does not necessarily exists on the file system).
+    # content - Content of the file.
+    #
+    # Returns a Blob.
+    def initialize(path, content)
+      @path = path
+      @content = content
+    end
+
+    # Public: Filename
+    #
+    # Examples
+    #
+    #   Blob.new("/path/to/linguist/lib/linguist.rb", "").path
+    #   # =>  "/path/to/linguist/lib/linguist.rb"
+    #
+    # Returns a String
+    attr_reader :path
+
+    # Public: File name
+    #
+    # Returns a String
+    def name
+      File.basename(@path)
+    end
+
+    # Public: File contents.
+    #
+    # Returns a String.
+    def data
+      @content
+    end
+
+    # Public: Get byte size
+    #
+    # Returns an Integer.
+    def size
+      @content.bytesize
+    end
+
+    # Public: Get file extension.
+    #
+    # Returns a String.
+    def extension
+      extensions.last || ""
+    end
+
+    # Public: Return an array of the file extensions
+    #
+    #     >> Linguist::Blob.new("app/views/things/index.html.erb").extensions
+    #     => [".html.erb", ".erb"]
+    #
+    # Returns an Array
+    def extensions
+      _, *segments = name.downcase.split(".")
+
+      segments.map.with_index do |segment, index|
+        "." + segments[index..-1].join(".")
+      end
+    end
+  end
+end
--- a/lib/linguist/blob_helper.rb
+++ b/lib/linguist/blob_helper.rb
@@ -1,15 +1,12 @@
 require 'linguist/generated'
-require 'linguist/language'
-
 require 'charlock_holmes'
 require 'escape_utils'
 require 'mime/types'
-require 'pygments'
 require 'yaml'

 module Linguist
  # DEPRECATED Avoid mixing into Blob classes. Prefer functional interfaces
-  # like `Language.detect` over `Blob#language`. Functions are much easier to
+  # like `Linguist.detect` over `Blob#language`. Functions are much easier to
  # cache and compose.
  #
  # Avoid adding additional bloat to this module.
@@ -102,7 +99,7 @@ module Linguist
      elsif name.nil?
        "attachment"
      else
-        "attachment; filename=#{EscapeUtils.escape_url(File.basename(name))}"
+        "attachment; filename=#{EscapeUtils.escape_url(name)}"
      end
    end

@@ -112,6 +109,12 @@ module Linguist
      end
    end

+    def ruby_encoding
+      if hash = detect_encoding
+        hash[:ruby_encoding]
+      end
+    end
+
    # Try to guess the encoding
    #
    # Returns: a Hash, with :encoding, :confidence, :type
@@ -143,6 +146,13 @@ module Linguist
      end
    end

+    # Public: Is the blob empty?
+    #
+    # Return true or false
+    def empty?
+      data.nil? || data == ""
+    end
+
    # Public: Is the blob text?
    #
    # Return true or false
@@ -189,10 +199,6 @@ module Linguist

    # Public: Is the blob safe to colorize?
    #
-    # We use Pygments for syntax highlighting blobs. Pygments
-    # can be too slow for very large blobs or for certain
-    # corner-case blobs.
-    #
    # Return true or false
    def safe_to_colorize?
      !large? && text? && !high_ratio_of_long_lines?
@@ -200,9 +206,6 @@ module Linguist

    # Internal: Does the blob have a ratio of long lines?
    #
-    # These types of files are usually going to make Pygments.rb
-    # angry if we try to colorize them.
-    #
    # Return true or false
    def high_ratio_of_long_lines?
      return false if loc == 0
@@ -230,7 +233,22 @@ module Linguist
    #
    # Return true or false
    def vendored?
-      name =~ VendoredRegexp ? true : false
+      path =~ VendoredRegexp ? true : false
+    end
+
+    documentation_paths = YAML.load_file(File.expand_path("../documentation.yml", __FILE__))
+    DocumentationRegexp = Regexp.new(documentation_paths.join('|'))
+
+    # Public: Is the blob in a documentation directory?
+    #
+    # Documentation files are ignored by language statistics.
+    #
+    # See "documentation.yml" for a list of documentation conventions that match
+    # this pattern.
+    #
+    # Return true or false
+    def documentation?
+      path =~ DocumentationRegexp ? true : false
    end

    # Public: Get each line of data
@@ -241,7 +259,31 @@ module Linguist
    def lines
      @lines ||=
        if viewable? && data
-          data.split(/\r\n|\r|\n/, -1)
+          # `data` is usually encoded as ASCII-8BIT even when the content has
+          # been detected as a different encoding. However, we are not allowed
+          # to change the encoding of `data` because we've made the implicit
+          # guarantee that each entry in `lines` is encoded the same way as
+          # `data`.
+          #
+          # Instead, we re-encode each possible newline sequence as the
+          # detected encoding, then force them back to the encoding of `data`
+          # (usually a binary encoding like ASCII-8BIT). This means that the
+          # byte sequence will match how newlines are likely encoded in the
+          # file, but we don't have to change the encoding of `data` as far as
+          # Ruby is concerned. This allows us to correctly parse out each line
+          # without changing the encoding of `data`, and
+          # also--importantly--without having to duplicate many (potentially
+          # large) strings.
+          begin
+            encoded_newlines = ["\r\n", "\r", "\n"].
+              map { |nl| nl.encode(ruby_encoding, "ASCII-8BIT").force_encoding(data.encoding) }
+
+            data.split(Regexp.union(encoded_newlines), -1)
+          rescue Encoding::ConverterNotFoundError
+            # The data is not splittable in the detected encoding.  Assume it's
+            # one big line.
+            [data]
+          end
        else
          []
        end
@@ -274,7 +316,7 @@ module Linguist
    #
    # Return true or false
    def generated?
-      @_generated ||= Generated.generated?(name, lambda { data })
+      @_generated ||= Generated.generated?(path, lambda { data })
    end

    # Public: Detects the Language of the blob.
@@ -283,34 +325,22 @@ module Linguist
    #
    # Returns a Language or nil if none is detected
    def language
-      return @language if defined? @language
-
-      if defined?(@data) && @data.is_a?(String)
-        data = @data
-      else
-        data = lambda { (binary_mime_type? || binary?) ? "" : self.data }
-      end
-
-      @language = Language.detect(name.to_s, data, mode)
+      @language ||= Linguist.detect(self)
    end

-    # Internal: Get the lexer of the blob.
-    #
-    # Returns a Lexer.
-    def lexer
-      language ? language.lexer : Pygments::Lexer.find_by_name('Text only')
+    # Internal: Get the TextMate compatible scope for the blob
+    def tm_scope
+      language && language.tm_scope
    end

-    # Public: Highlight syntax of blob
-    #
-    # options - A Hash of options (defaults to {})
-    #
-    # Returns html String
-    def colorize(options = {})
-      return unless safe_to_colorize?
-      options[:options] ||= {}
-      options[:options][:encoding] ||= encoding
-      lexer.highlight(data, options)
+    DETECTABLE_TYPES = [:programming, :markup].freeze
+
+    # Internal: Should this blob be included in repository language statistics?
+    def include_in_language_stats?
+      !vendored? &&
+      !documentation? &&
+      !generated? &&
+      language && DETECTABLE_TYPES.include?(language.type)
    end
  end
 end
--- a/lib/linguist/classifier.rb
+++ b/lib/linguist/classifier.rb
@@ -3,6 +3,25 @@ require 'linguist/tokenizer'
 module Linguist
  # Language bayesian classifier.
  class Classifier
+    # Public: Use the classifier to detect language of the blob.
+    #
+    # blob               - An object that quacks like a blob.
+    # possible_languages - Array of Language objects
+    #
+    # Examples
+    #
+    #   Classifier.call(FileBlob.new("path/to/file"), [
+    #     Language["Ruby"], Language["Python"]
+    #   ])
+    #
+    # Returns an Array of Language objects, most probable first.
+    def self.call(blob, possible_languages)
+      language_names = possible_languages.map(&:name)
+      classify(Samples.cache, blob.data, language_names).map do |name, _|
+        Language[name] # Return the actual Language objects
+      end
+    end
+
    # Public: Train classifier that data is a certain language.
    #
    # db       - Hash classifier database object
--- a/lib/linguist/documentation.yml
+++ b/lib/linguist/documentation.yml
@@ -0,0 +1,30 @@
+# Documentation files and directories are excluded from language
+# statistics.
+#
+# Lines in this file are Regexps that are matched against the file
+# pathname.
+#
+# Please add additional test coverage to
+# `test/test_blob.rb#test_documentation` if you make any changes.
+
+## Documentation directories ##
+
+- ^docs?/
+- (^|/)[Dd]ocumentation/
+- (^|/)javadoc/
+- ^man/
+- ^[Ee]xamples/
+
+## Documentation files ##
+
+- (^|/)CHANGE(S|LOG)?(\.|$)
+- (^|/)CONTRIBUTING(\.|$)
+- (^|/)COPYING(\.|$)
+- (^|/)INSTALL(\.|$)
+- (^|/)LICEN[CS]E(\.|$)
+- (^|/)[Ll]icen[cs]e(\.|$)
+- (^|/)README(\.|$)
+- (^|/)[Rr]eadme(\.|$)
+
+# Samples folders
+- ^[Ss]amples/
--- a/lib/linguist/file_blob.rb
+++ b/lib/linguist/file_blob.rb
@@ -1,10 +1,11 @@
 require 'linguist/blob_helper'
+require 'linguist/blob'

 module Linguist
  # A FileBlob is a wrapper around a File object to make it quack
  # like a Grit::Blob. It provides the basic interface: `name`,
-  # `data`, and `size`.
-  class FileBlob
+  # `data`, `path` and `size`.
+  class FileBlob < Blob
    include BlobHelper

    # Public: Initialize a new FileBlob from a path
@@ -14,43 +15,29 @@ module Linguist
    #
    # Returns a FileBlob.
    def initialize(path, base_path = nil)
-      @path = path
-      @name = base_path ? path.sub("#{base_path}/", '') : path
+      @fullpath = path
+      @path = base_path ? path.sub("#{base_path}/", '') : path
    end

-    # Public: Filename
-    #
-    # Examples
-    #
-    #   FileBlob.new("/path/to/linguist/lib/linguist.rb").name
-    #   # =>  "/path/to/linguist/lib/linguist.rb"
-    #
-    #   FileBlob.new("/path/to/linguist/lib/linguist.rb",
-    #                "/path/to/linguist").name
-    #   # =>  "lib/linguist.rb"
-    #
-    # Returns a String
-    attr_reader :name
-
    # Public: Read file permissions
    #
    # Returns a String like '100644'
    def mode
-      File.stat(@path).mode.to_s(8)
+      File.stat(@fullpath).mode.to_s(8)
    end

    # Public: Read file contents.
    #
    # Returns a String.
    def data
-      File.read(@path)
+      File.read(@fullpath)
    end

    # Public: Get byte size
    #
    # Returns an Integer.
    def size
-      File.size(@path)
+      File.size(@fullpath)
    end
  end
 end
--- a/lib/linguist/generated.rb
+++ b/lib/linguist/generated.rb
@@ -51,29 +51,40 @@ module Linguist
    #
    # Return true or false
    def generated?
-      name == 'Gemfile.lock' ||
-        minified_files? ||
-        compiled_coffeescript? ||
-        xcode_project_file? ||
-        generated_parser? ||
-        generated_net_docfile? ||
-        generated_net_designer_file? ||
-        generated_postscript? ||
-        generated_protocol_buffer? ||
-        generated_jni_header? ||
-        composer_lock? ||
-        node_modules? ||
-        vcr_cassette?
+      xcode_file? ||
+      generated_net_designer_file? ||
+      generated_net_specflow_feature_file? ||
+      composer_lock? ||
+      node_modules? ||
+      godeps? ||
+      generated_by_zephir? ||
+      minified_files? ||
+      source_map? ||
+      compiled_coffeescript? ||
+      generated_parser? ||
+      generated_net_docfile? ||
+      generated_postscript? ||
+      compiled_cython_file? ||
+      generated_go? ||
+      generated_protocol_buffer? ||
+      generated_apache_thrift? ||
+      generated_jni_header? ||
+      vcr_cassette? ||
+      generated_module? ||
+      generated_unity3d_meta? ||
+      generated_racc? ||
+      generated_jflex? ||
+      generated_grammarkit?
    end

-    # Internal: Is the blob an XCode project file?
+    # Internal: Is the blob an Xcode file?
    #
-    # Generated if the file extension is an XCode project
+    # Generated if the file extension is an Xcode
    # file extension.
    #
    # Returns true of false.
-    def xcode_project_file?
-      ['.xib', '.nib', '.storyboard', '.pbxproj', '.xcworkspacedata', '.xcuserstate'].include?(extname)
+    def xcode_file?
+      ['.nib', '.xcworkspacedata', '.xcuserstate'].include?(extname)
    end

    # Internal: Is the blob minified files?
@@ -93,6 +104,20 @@ module Linguist
      end
    end

+    # Internal: Is the blob a generated source map?
+    #
+    # Source Maps usually have .css.map or .js.map extensions. In case they
+    # are not following the name convention, detect them based on the content.
+    #
+    # Returns true or false.
+    def source_map?
+      return false unless extname.downcase == '.map'
+
+      name =~ /(\.css|\.js)\.map$/i ||                 # Name convention
+      lines[0] =~ /^{"version":\d+,/ ||                # Revision 2 and later begin with the version number
+      lines[0] =~ /^\/\*\* Begin line maps\. \*\*\/{/  # Revision 1 begins with a magic comment
+    end
+
    # Internal: Is the blob of JS generated by CoffeeScript?
    #
    # CoffeeScript is meant to output JS that would be difficult to
@@ -161,6 +186,17 @@ module Linguist
      name.downcase =~ /\.designer\.cs$/
    end

+    # Internal: Is this a codegen file for Specflow feature file?
+    #
+    # Visual Studio's SpecFlow extension generates *.feature.cs files
+    # from *.feature files, they are not meant to be consumed by humans.
+    # Let's hide them.
+    #
+    # Returns true or false
+    def generated_net_specflow_feature_file?
+      name.downcase =~ /\.feature\.cs$/
+    end
+
    # Internal: Is the blob of JS a parser generated by PEG.js?
    #
    # PEG.js-generated parsers are not meant to be consumed by humans.
@@ -201,17 +237,38 @@ module Linguist
        creator.include?("ImageMagick")
    end

+    def generated_go?
+      return false unless extname == '.go'
+      return false unless lines.count > 1
+
+      return lines[0].include?("Code generated by")
+    end
+
+    PROTOBUF_EXTENSIONS = ['.py', '.java', '.h', '.cc', '.cpp']
+
    # Internal: Is the blob a C++, Java or Python source file generated by the
    # Protocol Buffer compiler?
    #
    # Returns true of false.
    def generated_protocol_buffer?
-      return false unless ['.py', '.java', '.h', '.cc', '.cpp'].include?(extname)
+      return false unless PROTOBUF_EXTENSIONS.include?(extname)
      return false unless lines.count > 1

      return lines[0].include?("Generated by the protocol buffer compiler.  DO NOT EDIT!")
    end

+    APACHE_THRIFT_EXTENSIONS = ['.rb', '.py', '.go', '.js', '.m', '.java', '.h', '.cc', '.cpp']
+
+    # Internal: Is the blob generated by Apache Thrift compiler?
+    #
+    # Returns true or false
+    def generated_apache_thrift?
+      return false unless APACHE_THRIFT_EXTENSIONS.include?(extname)
+      return false unless lines.count > 1
+
+      return lines[0].include?("Autogenerated by Thrift Compiler") || lines[1].include?("Autogenerated by Thrift Compiler")
+    end
+
    # Internal: Is the blob a C/C++ header generated by the Java JNI tool javah?
    #
    # Returns true of false.
@@ -230,11 +287,26 @@ module Linguist
      !!name.match(/node_modules\//)
    end

+    # Internal: Is the blob part of Godeps/,
+    # which are not meant for humans in pull requests.
+    #
+    # Returns true or false.
+    def godeps?
+      !!name.match(/Godeps\//)
+    end
+
    # Internal: Is the blob a generated php composer lock file?
    #
    # Returns true or false.
    def composer_lock?
-      !!name.match(/composer.lock/)
+      !!name.match(/composer\.lock/)
+    end
+
+    # Internal: Is the blob a generated by Zephir
+    #
+    # Returns true or false.
+    def generated_by_zephir?
+      !!name.match(/.\.zep\.(?:c|h|php)$/)
    end

    # Is the blob a VCR Cassette file?
@@ -246,5 +318,89 @@ module Linguist
      # VCR Cassettes have "recorded_with: VCR" in the second last line.
      return lines[-2].include?("recorded_with: VCR")
    end
+
+    # Internal: Is this a compiled C/C++ file from Cython?
+    #
+    # Cython-compiled C/C++ files typically contain:
+    # /* Generated by Cython x.x.x on ... */
+    # on the first line.
+    #
+    # Return true or false
+    def compiled_cython_file?
+      return false unless ['.c', '.cpp'].include? extname
+      return false unless lines.count > 1
+      return lines[0].include?("Generated by Cython")
+    end
+
+    # Internal: Is it a KiCAD or GFortran module file?
+    #
+    # KiCAD module files contain:
+    # PCBNEW-LibModule-V1  yyyy-mm-dd h:mm:ss XM
+    # on the first line.
+    #
+    # GFortran module files contain:
+    # GFORTRAN module version 'x' created from 
+    # on the first line.
+    #
+    # Return true of false
+    def generated_module?
+      return false unless extname == '.mod'
+      return false unless lines.count > 1
+      return lines[0].include?("PCBNEW-LibModule-V") || 
+              lines[0].include?("GFORTRAN module version '")
+    end
+
+    # Internal: Is this a metadata file from Unity3D?
+    #
+    # Unity3D Meta files start with:
+    #   fileFormatVersion: X
+    #   guid: XXXXXXXXXXXXXXX
+    #
+    # Return true or false
+    def generated_unity3d_meta?
+      return false unless extname == '.meta'
+      return false unless lines.count > 1
+      return lines[0].include?("fileFormatVersion: ")
+    end
+
+    # Internal: Is this a Racc-generated file?
+    #
+    # A Racc-generated file contains:
+    # # This file is automatically generated by Racc x.y.z
+    # on the third line.
+    #
+    # Return true or false
+    def generated_racc?
+      return false unless extname == '.rb'
+      return false unless lines.count > 2
+      return lines[2].start_with?("# This file is automatically generated by Racc")
+    end
+
+    # Internal: Is this a JFlex-generated file?
+    #
+    # A JFlex-generated file contains:
+    # /* The following code was generated by JFlex x.y.z on d/at/e ti:me */
+    # on the first line.
+    #
+    # Return true or false
+    def generated_jflex?
+      return false unless extname == '.java'
+      return false unless lines.count > 1
+      return lines[0].start_with?("/* The following code was generated by JFlex ")
+    end
+
+    # Internal: Is this a GrammarKit-generated file?
+    #
+    # A GrammarKit-generated file typically contain:
+    # // This is a generated file. Not intended for manual editing.
+    # on the first line. This is not always the case, as it's possible to
+    # customize the class header.
+    #
+    # Return true or false
+    def generated_grammarkit?
+      return false unless extname == '.java'
+      return false unless lines.count > 1
+      return lines[0].start_with?("// This is a generated file. Not intended for manual editing.")
+    end
  end
 end
--- a/lib/linguist/grammars.rb
+++ b/lib/linguist/grammars.rb
@@ -0,0 +1,10 @@
+module Linguist
+  module Grammars
+    # Get the path to the directory containing the language grammar JSON files.
+    #
+    # Returns a String.
+    def self.path
+      File.expand_path("../../../grammars", __FILE__)
+    end
+  end
+end
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -1,90 +1,397 @@
 module Linguist
  # A collection of simple heuristics that can be used to better analyze languages.
  class Heuristics
-    ACTIVE = false
+    # Public: Use heuristics to detect language of the blob.
+    #
+    # blob               - An object that quacks like a blob.
+    # possible_languages - Array of Language objects
+    #
+    # Examples
+    #
+    #   Heuristics.call(FileBlob.new("path/to/file"), [
+    #     Language["Ruby"], Language["Python"]
+    #   ])
+    #
+    # Returns an Array of languages, or empty if none matched or were inconclusive.
+    def self.call(blob, candidates)
+      data = blob.data

-    # Public: Given an array of String language names,
-    # apply heuristics against the given data and return an array
-    # of matching languages, or nil.
+      @heuristics.each do |heuristic|
+        if heuristic.matches?(blob.name)
+          languages = Array(heuristic.call(data))
+          return languages if languages.any? || languages.all? { |l| candidates.include?(l) }
+        end
+      end
+
+      [] # No heuristics matched
+    end
+
+    # Internal: Define a new heuristic.
    #
-    # data      - Array of tokens or String data to analyze.
-    # languages - Array of language name Strings to restrict to.
+    # languages - String names of languages to disambiguate.
+    # heuristic - Block which takes data as an argument and returns a Language or nil.
    #
-    # Returns an array of Languages or []
-    def self.find_by_heuristics(data, languages)
-      if active?
-        if languages.all? { |l| ["Objective-C", "C++"].include?(l) }
-          disambiguate_c(data, languages)
-        end
-        if languages.all? { |l| ["Perl", "Prolog"].include?(l) }
-          disambiguate_pl(data, languages)
-        end
-        if languages.all? { |l| ["ECL", "Prolog"].include?(l) }
-          disambiguate_ecl(data, languages)
-        end
-        if languages.all? { |l| ["TypeScript", "XML"].include?(l) }
-          disambiguate_ts(data, languages)
-        end
-        if languages.all? { |l| ["Common Lisp", "OpenCL"].include?(l) }
-          disambiguate_cl(data, languages)
-        end
-        if languages.all? { |l| ["Rebol", "R"].include?(l) }
-          disambiguate_r(data, languages)
-        end
+    # Examples
+    #
+    #     disambiguate ".pm" do |data|
+    #       if data.include?("use strict")
+    #         Language["Perl"]
+    #       elsif /^[^#]+:-/.match(data)
+    #         Language["Prolog"]
+    #       end
+    #     end
+    #
+    def self.disambiguate(*extensions, &heuristic)
+      @heuristics << new(extensions, &heuristic)
+    end
+
+    # Internal: Array of defined heuristics
+    @heuristics = []
+
+    # Internal
+    def initialize(extensions, &heuristic)
+      @extensions = extensions
+      @heuristic = heuristic
+    end
+
+    # Internal: Check if this heuristic matches the candidate languages.
+    def matches?(filename)
+      filename = filename.downcase
+      @extensions.any? { |ext| filename.end_with?(ext) }
+    end
+
+    # Internal: Perform the heuristic
+    def call(data)
+      @heuristic.call(data)
+    end
+
+    # Common heuristics
+    ObjectiveCRegex = /^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])/
+
+    disambiguate ".asc" do |data|
+      if /^(----[- ]BEGIN|ssh-(rsa|dss)) /.match(data)
+        Language["Public Key"]
+      elsif /^[=-]+(\s|\n)|{{[A-Za-z]/.match(data)
+        Language["AsciiDoc"]
+      elsif /^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])/.match(data)
+        Language["AGS Script"]
      end
    end

-    # .h extensions are ambigious between C, C++, and Objective-C.
-    # We want to shortcut look for Objective-C _and_ now C++ too!
-    #
-    # Returns an array of Languages or []
-    def self.disambiguate_c(data, languages)
-      matches = []
-      matches << Language["Objective-C"] if data.include?("@interface")
-      matches << Language["C++"] if data.include?("#include <cstdint>")
-      matches
+    disambiguate ".bb" do |data|
+      if /^\s*; /.match(data) || data.include?("End Function")
+        Language["BlitzBasic"]
+      elsif /^\s*(# |include|require)\b/.match(data)
+        Language["BitBake"]
+      end
    end

-    def self.disambiguate_pl(data, languages)
-      matches = []
-      matches << Language["Prolog"] if data.include?(":-")
-      matches << Language["Perl"] if data.include?("use strict")
-      matches
+    disambiguate ".ch" do |data|
+      if /^\s*#\s*(if|ifdef|ifndef|define|command|xcommand|translate|xtranslate|include|pragma|undef)\b/i.match(data)
+        Language["xBase"]
+      end
    end

-    def self.disambiguate_ecl(data, languages)
-      matches = []
-      matches << Language["Prolog"] if data.include?(":-")
-      matches << Language["ECL"] if data.include?(":=")
-      matches
+    disambiguate ".cl" do |data|
+      if /^\s*\((defun|in-package|defpackage) /i.match(data)
+        Language["Common Lisp"]
+      elsif /^class/x.match(data)
+        Language["Cool"]
+      elsif /\/\* |\/\/ |^\}/.match(data)
+        Language["OpenCL"]
+      end
    end

-    def self.disambiguate_ts(data, languages)
-      matches = []
-      if (data.include?("</translation>"))
-        matches << Language["XML"]
+    disambiguate ".cs" do |data|
+      if /![\w\s]+methodsFor: /.match(data)
+        Language["Smalltalk"]
+      elsif /^\s*namespace\s*[\w\.]+\s*{/.match(data) || /^\s*\/\//.match(data)
+        Language["C#"]
+      end
+    end
+
+    disambiguate ".d" do |data|
+      if /^module /.match(data)
+        Language["D"]
+      elsif /^((dtrace:::)?BEGIN|provider |#pragma (D (option|attributes)|ident)\s)/.match(data)
+        Language["DTrace"]
+      elsif /(\/.*:( .* \\)$| : \\$|^ : |: \\$)/.match(data)
+        Language["Makefile"]
+      end
+    end
+
+    disambiguate ".ecl" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["ECLiPSe"]
+      elsif data.include?(":=")
+        Language["ECL"]
+      end
+    end
+    
+    disambiguate ".es" do |data|
+      if /^\s*(?:%%|main\s*\(.*?\)\s*->)/.match(data)
+        Language["Erlang"]
+      elsif /(?:\/\/|("|')use strict\1|export\s+default\s|\/\*.*?\*\/)/m.match(data)
+        Language["JavaScript"]
+      end
+    end
+
+    disambiguate ".for", ".f" do |data|
+      if /^: /.match(data)
+        Language["Forth"]
+      elsif /^([c*][^abd-z]|      (subroutine|program|end)\s|\s*!)/i.match(data)
+        Language["FORTRAN"]
+      end
+    end
+
+    disambiguate ".fr" do |data|
+      if /^(: |also |new-device|previous )/.match(data)
+        Language["Forth"]
+      elsif /^\s*(import|module|package|data|type) /.match(data)
+        Language["Frege"]
      else
-        matches << Language["TypeScript"]
+        Language["Text"]
      end
-      matches
    end

-    def self.disambiguate_cl(data, languages)
-      matches = []
-      matches << Language["Common Lisp"] if data.include?("(defun ")
-      matches << Language["OpenCL"] if /\/\* |\/\/ |^\}/.match(data)
-      matches
+    disambiguate ".fs" do |data|
+      if /^(: |new-device)/.match(data)
+        Language["Forth"]
+      elsif /^\s*(#light|import|let|module|namespace|open|type)/.match(data)
+        Language["F#"]
+      elsif /^\s*(#version|precision|uniform|varying|vec[234])/.match(data)
+        Language["GLSL"]
+      elsif /#include|#pragma\s+(rs|version)|__attribute__/.match(data)
+        Language["Filterscript"]
+      end
    end

-    def self.disambiguate_r(data, languages)
-      matches = []
-      matches << Language["Rebol"] if /\bRebol\b/i.match(data)
-      matches << Language["R"] if data.include?("<-")
-      matches
+    disambiguate ".gs" do |data|
+      Language["Gosu"] if /^uses java\./.match(data)
    end

-    def self.active?
-      !!ACTIVE
+    disambiguate ".h" do |data|
+      if ObjectiveCRegex.match(data)
+        Language["Objective-C"]
+      elsif (/^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>/.match(data) ||
+        /^\s*template\s*</.match(data) || /^[ \t]*try/.match(data) || /^[ \t]*catch\s*\(/.match(data) || /^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+/.match(data) || /^[ \t]*(private|public|protected):$/.match(data) || /std::\w+/.match(data))
+        Language["C++"]
+      end
+    end
+
+    disambiguate ".l" do |data|
+      if /\(def(un|macro)\s/.match(data)
+        Language["Common Lisp"]
+      elsif /^(%[%{}]xs|<.*>)/.match(data)
+        Language["Lex"]
+      elsif /^\.[a-z][a-z](\s|$)/i.match(data)
+        Language["Groff"]
+      elsif /^\((de|class|rel|code|data|must)\s/.match(data)
+        Language["PicoLisp"]
+      end
+    end
+
+    disambiguate ".ls" do |data|
+      if /^\s*package\s*[\w\.\/\*\s]*\s*{/.match(data)
+        Language["LoomScript"]
+      else
+        Language["LiveScript"]
+      end
+    end
+
+    disambiguate ".lsp", ".lisp" do |data|
+      if /^\s*\((defun|in-package|defpackage) /i.match(data)
+        Language["Common Lisp"]
+      elsif /^\s*\(define /.match(data)
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate ".m" do |data|
+      if ObjectiveCRegex.match(data)
+        Language["Objective-C"]
+      elsif data.include?(":- module")
+        Language["Mercury"]
+      elsif /^: /.match(data)
+        Language["MUF"]
+      elsif /^\s*;/.match(data)
+        Language["M"]
+      elsif /^\s*\(\*/.match(data)
+        Language["Mathematica"]
+      elsif /^\s*%/.match(data)
+        Language["Matlab"]
+      elsif /^\w+\s*:\s*module\s*{/.match(data)
+        Language["Limbo"]
+      end
+    end
+
+    disambiguate ".ml" do |data|
+      if /(^\s*module)|let rec |match\s+(\S+\s)+with/.match(data)
+        Language["OCaml"]
+      elsif /=> |case\s+(\S+\s)+of/.match(data)
+        Language["Standard ML"]
+      end
+    end
+
+    disambiguate ".mod" do |data|
+      if data.include?('<!ENTITY ')
+        Language["XML"]
+      elsif /MODULE\s\w+\s*;/i.match(data) || /^\s*END \w+;$/i.match(data)
+        Language["Modula-2"]
+      else
+        [Language["Linux Kernel Module"], Language["AMPL"]]
+      end
+    end
+
+    disambiguate ".ms" do |data|
+      if /^[.'][a-z][a-z](\s|$)/i.match(data)
+        Language["Groff"]
+      elsif /(?<!\S)\.(include|globa?l)\s/.match(data) || /(?<!\/\*)(\A|\n)\s*\.[A-Za-z]/.match(data.gsub(/"([^\\"]|\\.)*"|'([^\\']|\\.)*'|\\\s*(?:--.*)?\n/, ""))
+        Language["GAS"]
+      else
+        Language["MAXScript"]
+      end
+    end
+
+    disambiguate ".n" do |data|
+      if /^[.']/.match(data)
+        Language["Groff"]
+      elsif /^(module|namespace|using)\s/.match(data)
+        Language["Nemerle"]
+      end
+    end
+
+    disambiguate ".ncl" do |data|
+      if data.include?("THE_TITLE")
+        Language["Text"]
+      end
+    end
+
+    disambiguate ".nl" do |data|
+      if /^(b|g)[0-9]+ /.match(data)
+        Language["NL"]
+      else
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate ".php" do |data|
+      if data.include?("<?hh")
+        Language["Hack"]
+      elsif /<?[^h]/.match(data)
+        Language["PHP"]
+      end
+    end
+
+    disambiguate ".pl" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["Prolog"]
+      elsif /use strict|use\s+v?5\./.match(data)
+        Language["Perl"]
+      elsif /^(use v6|(my )?class|module)/.match(data)
+        Language["Perl6"]
+      end
+    end
+
+    disambiguate ".pm", ".t" do |data|
+      if /use strict|use\s+v?5\./.match(data)
+        Language["Perl"]
+      elsif /^(use v6|(my )?class|module)/.match(data)
+        Language["Perl6"]
+      end
+    end
+
+    disambiguate ".pod" do |data|
+      if /^=\w+$/.match(data)
+        Language["Pod"]
+      else
+        Language["Perl"]
+      end
+    end
+
+    disambiguate ".pro" do |data|
+      if /^[^#]+:-/.match(data)
+        Language["Prolog"]
+      elsif data.include?("last_client=")
+        Language["INI"]
+      elsif data.include?("HEADERS") && data.include?("SOURCES")
+        Language["QMake"]
+      elsif /^\s*function[ \w,]+$/.match(data)
+        Language["IDL"]
+      end
+    end
+
+    disambiguate ".props" do |data|
+      if /^(\s*)(<Project|<Import|<Property|<?xml|xmlns)/i.match(data)
+        Language["XML"]
+      elsif /\w+\s*=\s*/i.match(data)
+        Language["INI"]
+      end
+    end
+
+    disambiguate ".r" do |data|
+      if /\bRebol\b/i.match(data)
+        Language["Rebol"]
+      elsif data.include?("<-")
+        Language["R"]
+      end
+    end
+
+    disambiguate ".rpy" do |data|
+      if /(^(import|from|class|def)\s)/m.match(data)
+        Language["Python"]
+      else
+        Language["Ren'Py"]
+      end
+    end
+
+    disambiguate ".rs" do |data|
+      if /^(use |fn |mod |pub |macro_rules|impl|#!?\[)/.match(data)
+        Language["Rust"]
+      elsif /#include|#pragma\s+(rs|version)|__attribute__/.match(data)
+        Language["RenderScript"]
+      end
+    end
+
+    disambiguate ".sc" do |data|
+      if /\^(this|super)\./.match(data) || /^\s*(\+|\*)\s*\w+\s*{/.match(data) || /^\s*~\w+\s*=\./.match(data)
+        Language["SuperCollider"]
+      elsif /^\s*import (scala|java)\./.match(data) || /^\s*val\s+\w+\s*=/.match(data) || /^\s*class\b/.match(data)
+        Language["Scala"]
+      end
+    end
+
+    disambiguate ".sql" do |data|
+      if /^\\i\b|AS \$\$|LANGUAGE '?plpgsql'?/i.match(data) || /SECURITY (DEFINER|INVOKER)/i.match(data) || /BEGIN( WORK| TRANSACTION)?;/i.match(data)
+        #Postgres
+        Language["PLpgSQL"]
+      elsif /(alter module)|(language sql)|(begin( NOT)+ atomic)/i.match(data)  || /signal SQLSTATE '[0-9]+'/i.match(data)
+        #IBM db2
+        Language["SQLPL"]
+      elsif /pragma|\$\$PLSQL_|XMLTYPE|sysdate|systimestamp|\.nextval|connect by|AUTHID (DEFINER|CURRENT_USER)/i.match(data) || /constructor\W+function/i.match(data)
+        #Oracle
+        Language["PLSQL"]
+      elsif ! /begin|boolean|package|exception/i.match(data)
+        #Generic SQL
+        Language["SQL"]
+      end
+    end
+
+    disambiguate ".ts" do |data|
+      if data.include?("<TS ")
+        Language["XML"]
+      else
+        Language["TypeScript"]
+      end
+    end
+
+    disambiguate ".tst" do |data|
+      if (data.include?("gap> "))
+        Language["GAP"]
+      # Heads up - we don't usually write heuristics like this (with no regex match)
+      else
+        Language["Scilab"]
+      end
    end
  end
 end
--- a/lib/linguist/language.rb
+++ b/lib/linguist/language.rb
@@ -1,14 +1,18 @@
 require 'escape_utils'
-require 'pygments'
 require 'yaml'
 begin
-  require 'json'
+  require 'yajl'
 rescue LoadError
 end

 require 'linguist/classifier'
 require 'linguist/heuristics'
 require 'linguist/samples'
+require 'linguist/file_blob'
+require 'linguist/blob_helper'
+require 'linguist/strategy/filename'
+require 'linguist/strategy/modeline'
+require 'linguist/shebang'

 module Linguist
  # Language names that are recognizable by GitHub. Defined languages
@@ -24,18 +28,10 @@ module Linguist
    @extension_index          = Hash.new { |h,k| h[k] = [] }
    @interpreter_index        = Hash.new { |h,k| h[k] = [] }
    @filename_index           = Hash.new { |h,k| h[k] = [] }
-    @primary_extension_index  = {}

    # Valid Languages types
    TYPES = [:data, :markup, :programming, :prose]

-    # Names of non-programming languages that we will still detect
-    #
-    # Returns an array
-    def self.detectable_markup
-      ["CSS", "Less", "Sass", "SCSS", "Stylus", "TeX"]
-    end
-
    # Detect languages by a specific type
    #
    # type - A symbol that exists within TYPES
@@ -61,7 +57,7 @@ module Linguist
      end

      # Language name index
-      @index[language.name] = @name_index[language.name] = language
+      @index[language.name.downcase] = @name_index[language.name.downcase] = language

      language.aliases.each do |name|
        # All Language aliases should be unique. Raise if there is a duplicate.
@@ -69,7 +65,7 @@ module Linguist
          raise ArgumentError, "Duplicate alias: #{name}"
        end

-        @index[name] = @alias_index[name] = language
+        @index[name.downcase] = @alias_index[name.downcase] = language
      end

      language.extensions.each do |extension|
@@ -77,15 +73,9 @@ module Linguist
          raise ArgumentError, "Extension is missing a '.': #{extension.inspect}"
        end

-        @extension_index[extension] << language
+        @extension_index[extension.downcase] << language
      end

-      if @primary_extension_index.key?(language.primary_extension)
-        raise ArgumentError, "Duplicate primary extension: #{language.primary_extension}"
-      end
-
-      @primary_extension_index[language.primary_extension] = language
-
      language.interpreters.each do |interpreter|
        @interpreter_index[interpreter] << language
      end
@@ -99,49 +89,13 @@ module Linguist

    # Public: Detects the Language of the blob.
    #
-    # name - String filename
-    # data - String blob data. A block also maybe passed in for lazy
-    #        loading. This behavior is deprecated and you should always
-    #        pass in a String.
-    # mode - Optional String mode (defaults to nil)
+    # blob - an object that includes the Linguist `BlobHelper` interface;
+    #       see Linguist::LazyBlob and Linguist::FileBlob for examples
    #
    # Returns Language or nil.
-    def self.detect(name, data, mode = nil)
-      # A bit of an elegant hack. If the file is executable but extensionless,
-      # append a "magic" extension so it can be classified with other
-      # languages that have shebang scripts.
-      if File.extname(name).empty? && mode && (mode.to_i(8) & 05) == 05
-        name += ".script!"
-      end
-
-      # First try to find languages that match based on filename.
-      possible_languages = find_by_filename(name)
-
-      # If there is more than one possible language with that extension (or no
-      # extension at all, in the case of extensionless scripts), we need to continue
-      # our detection work
-      if possible_languages.length > 1
-        data = data.call() if data.respond_to?(:call)
-        possible_language_names = possible_languages.map(&:name)
-
-        # Don't bother with emptiness
-        if data.nil? || data == ""
-          nil
-        # Check if there's a shebang line and use that as authoritative
-        elsif (result = find_by_shebang(data)) && !result.empty?
-          result.first
-        # No shebang. Still more work to do. Try to find it with our heuristics.
-        elsif (determined = Heuristics.find_by_heuristics(data, possible_language_names)) && !determined.empty?
-          determined.first
-        # Lastly, fall back to the probablistic classifier.
-        elsif classified = Classifier.classify(Samples::DATA, data, possible_language_names ).first
-          # Return the actual Language object based of the string language name (i.e., first element of `#classify`)
-          Language[classified[0]]
-        end
-      else
-        # Simplest and most common case, we can just return the one match based on extension
-        possible_languages.first
-      end
+    def self.detect(blob)
+      warn "[DEPRECATED] `Linguist::Language.detect` is deprecated. Use `Linguist.detect`. #{caller[0]}"
+      Linguist.detect(blob)
    end

    # Public: Get all Languages
@@ -162,7 +116,8 @@ module Linguist
    #
    # Returns the Language or nil if none was found.
    def self.find_by_name(name)
-      @name_index[name]
+      return nil if name.to_s.empty?
+      name && (@name_index[name.downcase] || @name_index[name.split(',').first.downcase])
    end

    # Public: Look up Language by one of its aliases.
@@ -174,9 +129,10 @@ module Linguist
    #   Language.find_by_alias('cpp')
    #   # => #<Language name="C++">
    #
-    # Returns the Lexer or nil if none was found.
+    # Returns the Language or nil if none was found.
    def self.find_by_alias(name)
-      @alias_index[name]
+      return nil if name.to_s.empty?
+      name && (@alias_index[name.downcase] || @alias_index[name.split(',').first.downcase])
    end

    # Public: Look up Languages by filename.
@@ -190,28 +146,55 @@ module Linguist
    #
    # Returns all matching Languages or [] if none were found.
    def self.find_by_filename(filename)
-      basename, extname = File.basename(filename), File.extname(filename)
-      langs = [@primary_extension_index[extname]] +
-              @filename_index[basename] +
-              @extension_index[extname]
-      langs.compact.uniq
+      basename = File.basename(filename)
+
+      # find the first extension with language definitions
+      extname = FileBlob.new(filename).extensions.detect do |e|
+        !@extension_index[e].empty?
+      end
+
+      (@filename_index[basename] + @extension_index[extname]).compact.uniq
    end

-    # Public: Look up Languages by shebang line.
+    # Public: Look up Languages by file extension.
    #
-    # data - Array of tokens or String data to analyze.
+    # extname - The extension String.
    #
    # Examples
    #
-    #   Language.find_by_shebang("#!/bin/bash\ndate;")
+    #   Language.find_by_extension('.rb')
+    #   # => [#<Language name="Ruby">]
+    #
+    #   Language.find_by_extension('rb')
+    #   # => [#<Language name="Ruby">]
+    #
+    # Returns all matching Languages or [] if none were found.
+    def self.find_by_extension(extname)
+      extname = ".#{extname}" unless extname.start_with?(".")
+      @extension_index[extname.downcase]
+    end
+
+    # DEPRECATED
+    def self.find_by_shebang(data)
+      @interpreter_index[Shebang.interpreter(data)]
+    end
+
+    # Public: Look up Languages by interpreter.
+    #
+    # interpreter - String of interpreter name
+    #
+    # Examples
+    #
+    #   Language.find_by_interpreter("bash")
    #   # => [#<Language name="Bash">]
    #
    # Returns the matching Language
-    def self.find_by_shebang(data)
-      @interpreter_index[Linguist.interpreter_from_shebang(data)]
+    def self.find_by_interpreter(interpreter)
+      @interpreter_index[interpreter]
    end

-    # Public: Look up Language by its name or lexer.
+
+    # Public: Look up Language by its name.
    #
    # name - The String name of the Language
    #
@@ -225,7 +208,8 @@ module Linguist
    #
    # Returns the Language or nil if none was found.
    def self.[](name)
-      @index[name]
+      return nil if name.to_s.empty?
+      name && (@index[name.downcase] || @index[name.split(',').first.downcase])
    end

    # Public: A List of popular languages
@@ -235,7 +219,7 @@ module Linguist
    #
    # This list is configured in "popular.yml".
    #
-    # Returns an Array of Lexers.
+    # Returns an Array of Languages.
    def self.popular
      @popular ||= all.select(&:popular?).sort_by { |lang| lang.name.downcase }
    end
@@ -247,7 +231,7 @@ module Linguist
    #
    # This list is created from all the languages not listed in "popular.yml".
    #
-    # Returns an Array of Lexers.
+    # Returns an Array of Languages.
    def self.unpopular
      @unpopular ||= all.select(&:unpopular?).sort_by { |lang| lang.name.downcase }
    end
@@ -261,8 +245,12 @@ module Linguist

    # Public: A List of languages compatible with Ace.
    #
+    # TODO: Remove this method in a 5.x release. Every language now needs an ace_mode
+    # key, so this function isn't doing anything unique anymore.
+    #
    # Returns an Array of Languages.
    def self.ace_modes
+      warn "This method will be deprecated in a future 5.x release. Every language now has an `ace_mode` set."
      @ace_modes ||= all.select(&:ace_mode).sort_by { |lang| lang.name.downcase }
    end

@@ -284,9 +272,16 @@ module Linguist
      # Set aliases
      @aliases = [default_alias_name] + (attributes[:aliases] || [])

-      # Lookup Lexer object
-      @lexer = Pygments::Lexer.find_by_name(attributes[:lexer] || name) ||
-        raise(ArgumentError, "#{@name} is missing lexer")
+      # Load the TextMate scope name or try to guess one
+      @tm_scope = attributes[:tm_scope] || begin
+        context = case @type
+                  when :data, :markup, :prose
+                    'text'
+                  when :programming, nil
+                    'source'
+                  end
+        "#{context}.#{@name.downcase}"
+      end

      @ace_mode = attributes[:ace_mode]
      @wrap = attributes[:wrap] || false
@@ -299,15 +294,6 @@ module Linguist
      @interpreters = attributes[:interpreters]   || []
      @filenames  = attributes[:filenames]  || []

-      unless @primary_extension = attributes[:primary_extension]
-        raise ArgumentError, "#{@name} is missing primary extension"
-      end
-
-      # Prepend primary extension unless its already included
-      if primary_extension && !extensions.include?(primary_extension)
-        @extensions = [primary_extension] + extensions
-      end
-
      # Set popular, and searchable flags
      @popular    = attributes.key?(:popular)    ? attributes[:popular]    : false
      @searchable = attributes.key?(:searchable) ? attributes[:searchable] : true
@@ -365,10 +351,10 @@ module Linguist
    # Returns the name String
    attr_reader :search_term

-    # Public: Get Lexer
+    # Public: Get the name of a TextMate-compatible scope
    #
-    # Returns the Lexer
-    attr_reader :lexer
+    # Returns the scope
+    attr_reader :tm_scope

    # Public: Get Ace mode
    #
@@ -395,20 +381,6 @@ module Linguist
    # Returns the extensions Array
    attr_reader :extensions

-    # Deprecated: Get primary extension
-    #
-    # Defaults to the first extension but can be overridden
-    # in the languages.yml.
-    #
-    # The primary extension can not be nil. Tests should verify this.
-    #
-    # This attribute is only used by app/helpers/gists_helper.rb for
-    # creating the language dropdown. It really should be using `name`
-    # instead. Would like to drop primary extension.
-    #
-    # Returns the extension String.
-    attr_reader :primary_extension
-
    # Public: Get interpreters
    #
    # Examples
@@ -426,10 +398,21 @@ module Linguist
    #
    # Returns the extensions Array
    attr_reader :filenames
-    
-    # Public: Return all possible extensions for language
-    def all_extensions
-      (extensions + [primary_extension]).uniq
+
+    # Deprecated: Get primary extension
+    #
+    # Defaults to the first extension but can be overridden
+    # in the languages.yml.
+    #
+    # The primary extension can not be nil. Tests should verify this.
+    #
+    # This method is only used by app/helpers/gists_helper.rb for creating
+    # the language dropdown. It really should be using `name` instead.
+    # Would like to drop primary extension.
+    #
+    # Returns the extension String.
+    def primary_extension
+      extensions.first
    end

    # Public: Get URL escaped name.
@@ -483,16 +466,6 @@ module Linguist
      @searchable
    end

-    # Public: Highlight syntax of text
-    #
-    # text    - String of code to be highlighted
-    # options - A Hash of options (defaults to {})
-    #
-    # Returns html String
-    def colorize(text, options = {})
-      lexer.highlight(text, options)
-    end
-
    # Public: Return name as String representation
    def to_s
      name
@@ -515,16 +488,16 @@ module Linguist
    end
  end

-  extensions = Samples::DATA['extnames']
-  interpreters = Samples::DATA['interpreters']
-  filenames = Samples::DATA['filenames']
+  extensions = Samples.cache['extnames']
+  interpreters = Samples.cache['interpreters']
+  filenames = Samples.cache['filenames']
  popular = YAML.load_file(File.expand_path("../popular.yml", __FILE__))

  languages_yml = File.expand_path("../languages.yml", __FILE__)
  languages_json = File.expand_path("../languages.json", __FILE__)

-  if File.exist?(languages_json) && defined?(JSON)
-    languages = JSON.load(File.read(languages_json))
+  if File.exist?(languages_json) && defined?(Yajl)
+    languages = Yajl.load(File.read(languages_json))
  else
    languages = YAML.load_file(languages_yml)
  end
@@ -536,7 +509,8 @@ module Linguist

    if extnames = extensions[name]
      extnames.each do |extname|
-        if !options['extensions'].include?(extname)
+        if !options['extensions'].index { |x| x.downcase.end_with? extname.downcase }
+          warn "#{name} has a sample with extension (#{extname.downcase}) that isn't explicitly defined in languages.yml"
          options['extensions'] << extname
        end
      end
@@ -567,15 +541,14 @@ module Linguist
      :color             => options['color'],
      :type              => options['type'],
      :aliases           => options['aliases'],
-      :lexer             => options['lexer'],
+      :tm_scope          => options['tm_scope'],
      :ace_mode          => options['ace_mode'],
      :wrap              => options['wrap'],
      :group_name        => options['group'],
-      :searchable        => options.key?('searchable') ? options['searchable'] : true,
+      :searchable        => options.fetch('searchable', true),
      :search_term       => options['search_term'],
-      :extensions        => options['extensions'].sort,
+      :extensions        => Array(options['extensions']),
      :interpreters      => options['interpreters'].sort,
-      :primary_extension => options['primary_extension'],
      :filenames         => options['filenames'],
      :popular           => popular.include?(name)
    )
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
--- a/lib/linguist/lazy_blob.rb
+++ b/lib/linguist/lazy_blob.rb
@@ -0,0 +1,98 @@
+require 'linguist/blob_helper'
+require 'linguist/language'
+require 'rugged'
+
+module Linguist
+  class LazyBlob
+    GIT_ATTR = ['linguist-documentation',
+                'linguist-language',
+                'linguist-vendored',
+                'linguist-generated']
+
+    GIT_ATTR_OPTS = { :priority => [:index], :skip_system => true }
+    GIT_ATTR_FLAGS = Rugged::Repository::Attributes.parse_opts(GIT_ATTR_OPTS)
+
+    include BlobHelper
+
+    MAX_SIZE = 128 * 1024
+
+    attr_reader :repository
+    attr_reader :oid
+    attr_reader :path
+    attr_reader :mode
+
+    alias :name :path
+
+    def initialize(repo, oid, path, mode = nil)
+      @repository = repo
+      @oid = oid
+      @path = path
+      @mode = mode
+      @data = nil
+    end
+
+    def git_attributes
+      @git_attributes ||= repository.fetch_attributes(
+        name, GIT_ATTR, GIT_ATTR_FLAGS)
+    end
+
+    def documentation?
+      if attr = git_attributes['linguist-documentation']
+        boolean_attribute(attr)
+      else
+        super
+      end
+    end
+
+    def generated?
+      if attr = git_attributes['linguist-generated']
+        boolean_attribute(attr)
+      else
+        super
+      end
+    end
+
+    def vendored?
+      if attr = git_attributes['linguist-vendored']
+        return boolean_attribute(attr)
+      else
+        super
+      end
+    end
+
+    def language
+      return @language if defined?(@language)
+
+      @language = if lang = git_attributes['linguist-language']
+        Language.find_by_alias(lang)
+      else
+        super
+      end
+    end
+
+    def data
+      load_blob!
+      @data
+    end
+
+    def size
+      load_blob!
+      @size
+    end
+
+    def cleanup!
+      @data.clear if @data
+    end
+
+    protected
+
+    # Returns true if the attribute is present and not the string "false".
+    def boolean_attribute(attribute)
+      attribute != "false"
+    end
+
+    def load_blob!
+      @data, @size = Rugged::Blob.to_buffer(repository, oid, MAX_SIZE) if @data.nil?
+    end
+  end
+end
--- a/lib/linguist/popular.yml
+++ b/lib/linguist/popular.yml
@@ -3,27 +3,27 @@
 # This file should only be edited by GitHub staff

 - ActionScript
- Bash
 - C
 - C#
 - C++
 - CSS
 - Clojure
 - CoffeeScript
- Common Lisp
- Diff
- Emacs Lisp
- Erlang
+- Go
 - HTML
 - Haskell
 - Java
 - JavaScript
 - Lua
+- Matlab
 - Objective-C
 - PHP
 - Perl
 - Python
+- R
 - Ruby
- SQL
 - Scala
- Scheme
+- Shell
+- Swift
+- TeX
+- VimL
--- a/lib/linguist/repository.rb
+++ b/lib/linguist/repository.rb
@@ -1,4 +1,5 @@
-require 'linguist/file_blob'
+require 'linguist/lazy_blob'
+require 'rugged'

 module Linguist
  # A Repository is an abstraction of a Grit::Repo or a basic file
@@ -7,100 +8,168 @@ module Linguist
  # Its primary purpose is for gathering language statistics across
  # the entire project.
  class Repository
-    # Public: Initialize a new Repository from a File directory
-    #
-    # base_path - A path String
-    #
-    # Returns a Repository
-    def self.from_directory(base_path)
-      new Dir["#{base_path}/**/*"].
-        select { |f| File.file?(f) }.
-        map { |path| FileBlob.new(path, base_path) }
+    attr_reader :repository
+
+    # Public: Create a new Repository based on the stats of
+    # an existing one
+    def self.incremental(repo, commit_oid, old_commit_oid, old_stats)
+      repo = self.new(repo, commit_oid)
+      repo.load_existing_stats(old_commit_oid, old_stats)
+      repo
    end

-    # Public: Initialize a new Repository
+    # Public: Initialize a new Repository to be analyzed for language
+    # data
    #
-    # enum - Enumerator that responds to `each` and
-    #        yields Blob objects
+    # repo - a Rugged::Repository object
+    # commit_oid - the sha1 of the commit that will be analyzed;
+    #              this is usually the master branch
    #
    # Returns a Repository
-    def initialize(enum)
-      @enum = enum
-      @computed_stats = false
-      @language = @size = nil
-      @sizes = Hash.new { 0 }
-      @file_breakdown = Hash.new { |h,k| h[k] = Array.new }
+    def initialize(repo, commit_oid)
+      @repository = repo
+      @commit_oid = commit_oid
+
+      @old_commit_oid = nil
+      @old_stats = nil
+
+      raise TypeError, 'commit_oid must be a commit SHA1' unless commit_oid.is_a?(String)
+    end
+
+    # Public: Load the results of a previous analysis on this repository
+    # to speed up the new scan.
+    #
+    # The new analysis will be performed incrementally as to only take
+    # into account the file changes since the last time the repository
+    # was scanned
+    #
+    # old_commit_oid - the sha1 of the commit that was previously analyzed
+    # old_stats - the result of the previous analysis, obtained by calling
+    #             Repository#cache on the old repository
+    #
+    # Returns nothing
+    def load_existing_stats(old_commit_oid, old_stats)
+      @old_commit_oid = old_commit_oid
+      @old_stats = old_stats
+      nil
    end

    # Public: Returns a breakdown of language stats.
    #
    # Examples
    #
-    #   # => { Language['Ruby'] => 46319,
-    #          Language['JavaScript'] => 258 }
+    #   # => { 'Ruby' => 46319,
+    #          'JavaScript' => 258 }
    #
-    # Returns a Hash of Language keys and Integer size values.
+    # Returns a Hash of language names and Integer size values.
    def languages
-      compute_stats
-      @sizes
+      @sizes ||= begin
+        sizes = Hash.new { 0 }
+        cache.each do |_, (language, size)|
+          sizes[language] += size
+        end
+        sizes
+      end
    end

    # Public: Get primary Language of repository.
    #
-    # Returns a Language
+    # Returns a language name
    def language
-      compute_stats
-      @language
+      @language ||= begin
+        primary = languages.max_by { |(_, size)| size }
+        primary && primary[0]
+      end
    end

    # Public: Get the total size of the repository.
    #
    # Returns a byte size Integer
    def size
-      compute_stats
-      @size
+      @size ||= languages.inject(0) { |s,(_,v)| s + v }
    end

    # Public: Return the language breakdown of this repository by file
+    #
+    # Returns a map of language names => [filenames...]
    def breakdown_by_file
-      compute_stats
-      @file_breakdown
+      @file_breakdown ||= begin
+        breakdown = Hash.new { |h,k| h[k] = Array.new }
+        cache.each do |filename, (language, _)|
+          breakdown[language] << filename
+        end
+        breakdown
+      end
    end

-    # Internal: Compute language breakdown for each blob in the Repository.
+    # Public: Return the cached results of the analysis
    #
-    # Returns nothing
-    def compute_stats
-      return if @computed_stats
+    # This is a per-file breakdown that can be passed to other instances
+    # of Linguist::Repository to perform incremental scans
+    #
+    # Returns a map of filename => [language, size]
+    def cache
+      @cache ||= begin
+        if @old_commit_oid == @commit_oid
+          @old_stats
+        else
+          compute_stats(@old_commit_oid, @old_stats)
+        end
+      end
+    end

-      @enum.each do |blob|
-        # Skip files that are likely binary
-        next if blob.likely_binary?
+    def read_index
+      attr_index = Rugged::Index.new
+      attr_index.read_tree(current_tree)
+      repository.index = attr_index
+    end

-        # Skip vendored or generated blobs
-        next if blob.vendored? || blob.generated? || blob.language.nil?
+    def current_tree
+      @tree ||= Rugged::Commit.lookup(repository, @commit_oid).tree
+    end

-        # Only include programming languages and acceptable markup languages
-        if blob.language.type == :programming || Language.detectable_markup.include?(blob.language.name)
+    protected
+    MAX_TREE_SIZE = 100_000

-          # Build up the per-file breakdown stats
-          @file_breakdown[blob.language.group.name] << blob.name
+    def compute_stats(old_commit_oid, cache = nil)
+      return {} if current_tree.count_recursive(MAX_TREE_SIZE) >= MAX_TREE_SIZE

-          @sizes[blob.language.group] += blob.size
+      old_tree = old_commit_oid && Rugged::Commit.lookup(repository, old_commit_oid).tree
+      read_index
+      diff = Rugged::Tree.diff(repository, old_tree, current_tree)
+
+      # Clear file map and fetch full diff if any .gitattributes files are changed
+      if cache && diff.each_delta.any? { |delta| File.basename(delta.new_file[:path]) == ".gitattributes" }
+        diff = Rugged::Tree.diff(repository, old_tree = nil, current_tree)
+        file_map = {}
+      else
+        file_map = cache ? cache.dup : {}
+      end
+
+      diff.each_delta do |delta|
+        old = delta.old_file[:path]
+        new = delta.new_file[:path]
+
+        file_map.delete(old)
+        next if delta.binary
+
+        if [:added, :modified].include? delta.status
+          # Skip submodules and symlinks
+          mode = delta.new_file[:mode]
+          mode_format = (mode & 0170000)
+          next if mode_format == 0120000 || mode_format == 040000 || mode_format == 0160000
+
+          blob = Linguist::LazyBlob.new(repository, delta.new_file[:oid], new, mode.to_s(8))
+
+          if blob.include_in_language_stats?
+            file_map[new] = [blob.language.group.name, blob.size]
+          end
+
+          blob.cleanup!
        end
      end

-      # Compute total size
-      @size = @sizes.inject(0) { |s,(_,v)| s + v }
-
-      # Get primary language
-      if primary = @sizes.max_by { |(_, size)| size }
-        @language = primary[0]
-      end
-
-      @computed_stats = true
-
-      nil
+      file_map
    end
  end
 end
--- a/lib/linguist/samples.json
+++ b/lib/linguist/samples.json
--- a/lib/linguist/samples.rb
+++ b/lib/linguist/samples.rb
@@ -1,11 +1,12 @@
 begin
-  require 'json'
+  require 'yajl'
 rescue LoadError
  require 'yaml'
 end

 require 'linguist/md5'
 require 'linguist/classifier'
+require 'linguist/shebang'

 module Linguist
  # Model for accessing classifier training data.
@@ -17,9 +18,11 @@ module Linguist
    PATH = File.expand_path('../samples.json', __FILE__)

    # Hash of serialized samples object
-    if File.exist?(PATH)
-      serializer = defined?(JSON) ? JSON : YAML
-      DATA = serializer.load(File.read(PATH))
+    def self.cache
+      @cache ||= begin
+        serializer = defined?(Yajl) ? Yajl : YAML
+        serializer.load(File.read(PATH))
+      end
    end

    # Public: Iterate over each sample.
@@ -28,13 +31,9 @@ module Linguist
    #
    # Returns nothing.
    def self.each(&block)
-      Dir.entries(ROOT).each do |category|
+      Dir.entries(ROOT).sort!.each do |category|
        next if category == '.' || category == '..'

-        # Skip text and binary for now
-        # Possibly reconsider this later
-        next if category == 'Text' || category == 'Binary'
-
        dirname = File.join(ROOT, category)
        Dir.entries(dirname).each do |filename|
          next if filename == '.' || filename == '..'
@@ -50,15 +49,14 @@ module Linguist
              })
            end
          else
-            if File.extname(filename) == ""
-              raise "#{File.join(dirname, filename)} is missing an extension, maybe it belongs in filenames/ subdir"
-            end
+            path = File.join(dirname, filename)
+            extname = File.extname(filename)

            yield({
-              :path     => File.join(dirname, filename),
+              :path     => path,
              :language => category,
-              :interpreter => File.exist?(filename) ? Linguist.interpreter_from_shebang(File.read(filename)) : nil,
-              :extname  => File.extname(filename)
+              :interpreter => Shebang.interpreter(File.read(path)),
+              :extname  => extname.empty? ? nil : extname
            })
          end
        end
@@ -110,40 +108,4 @@ module Linguist
      db
    end
  end
-
-  # Used to retrieve the interpreter from the shebang line of a file's
-  # data.
-  def self.interpreter_from_shebang(data)
-    lines = data.lines.to_a
-
-    if lines.any? && (match = lines[0].match(/(.+)\n?/)) && (bang = match[0]) =~ /^#!/
-      bang.sub!(/^#! /, '#!')
-      tokens = bang.split(' ')
-      pieces = tokens.first.split('/')
-
-      if pieces.size > 1
-        script = pieces.last
-      else
-        script = pieces.first.sub('#!', '')
-      end
-
-      script = script == 'env' ? tokens[1] : script
-
-      # "python2.6" -> "python"
-      if script =~ /((?:\d+\.?)+)/
-        script.sub! $1, ''
-      end
-
-      # Check for multiline shebang hacks that call `exec`
-      if script == 'sh' &&
-        lines[0...5].any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
-        script = $1
-      end
-
-      script
-    else
-      nil
-    end
-  end
-
 end
--- a/lib/linguist/shebang.rb
+++ b/lib/linguist/shebang.rb
@@ -0,0 +1,59 @@
+module Linguist
+  class Shebang
+    # Public: Use shebang to detect language of the blob.
+    #
+    # blob               - An object that quacks like a blob.
+    #
+    # Examples
+    #
+    #   Shebang.call(FileBlob.new("path/to/file"))
+    #
+    # Returns an Array with one Language if the blob has a shebang with a valid
+    # interpreter, or empty if there is no shebang.
+    def self.call(blob, _ = nil)
+      Language.find_by_interpreter interpreter(blob.data)
+    end
+
+    # Public: Get the interpreter from the shebang
+    #
+    # Returns a String or nil
+    def self.interpreter(data)
+      shebang = data.lines.first
+
+      # First line must start with #!
+      return unless shebang && shebang.start_with?("#!")
+
+      s = StringScanner.new(shebang)
+
+      # There was nothing after the #!
+      return unless path = s.scan(/^#!\s*\S+/)
+
+      # Keep going
+      script = path.split('/').last
+
+      # if /usr/bin/env type shebang then walk the string
+      if script == 'env'
+        s.scan(/\s+/)
+        s.scan(/.*=[^\s]+\s+/) # skip over variable arguments e.g. foo=bar
+        script = s.scan(/\S+/)
+      end
+
+      # Interpreter was /usr/bin/env with no arguments
+      return unless script
+
+      # "python2.6" -> "python2"
+      script.sub!(/(\.\d+)$/, '')
+
+      # #! perl -> perl
+      script.sub!(/^#!\s*/, '')
+
+      # Check for multiline shebang hacks that call `exec`
+      if script == 'sh' &&
+        data.lines.first(5).any? { |l| l.match(/exec (\w+).+\$0.+\$@/) }
+        script = $1
+      end
+
+      File.basename(script)
+    end
+  end
+end
--- a/lib/linguist/strategy/filename.rb
+++ b/lib/linguist/strategy/filename.rb
@@ -0,0 +1,10 @@
+module Linguist
+  module Strategy
+    # Detects language based on filename and/or extension
+    class Filename
+      def self.call(blob, _)
+        Language.find_by_filename(blob.name.to_s)
+      end
+    end
+  end
+end
--- a/lib/linguist/strategy/modeline.rb
+++ b/lib/linguist/strategy/modeline.rb
@@ -0,0 +1,41 @@
+module Linguist
+  module Strategy
+    class Modeline
+      EMACS_MODELINE = /-\*-\s*(?:(?!mode)[\w-]+\s*:\s*(?:[\w+-]+)\s*;?\s*)*(?:mode\s*:)?\s*([\w+-]+)\s*(?:;\s*(?!mode)[\w-]+\s*:\s*[\w+-]+\s*)*;?\s*-\*-/i
+
+      # First form vim modeline
+      # [text]{white}{vi:|vim:|ex:}[white]{options}
+      # ex: 'vim: syntax=ruby'
+      VIM_MODELINE_1 = /(?:vim|vi|ex):\s*(?:ft|filetype|syntax)=(\w+)\s?/i
+
+      # Second form vim modeline (compatible with some versions of Vi)
+      # [text]{white}{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]
+      # ex: 'vim set syntax=ruby:'
+      VIM_MODELINE_2 = /(?:vim|vi|Vim|ex):\s*se(?:t)?.*\s(?:ft|filetype|syntax)=(\w+)\s?.*:/i
+
+      MODELINES = [EMACS_MODELINE, VIM_MODELINE_1, VIM_MODELINE_2]
+
+      # Public: Detects language based on Vim and Emacs modelines
+      #
+      # blob               - An object that quacks like a blob.
+      #
+      # Examples
+      #
+      #   Modeline.call(FileBlob.new("path/to/file"))
+      #
+      # Returns an Array with one Language if the blob has a Vim or Emacs modeline
+      # that matches a Language name or alias. Returns an empty array if no match.
+      def self.call(blob, _ = nil)
+        Array(Language.find_by_alias(modeline(blob.data)))
+      end
+
+      # Public: Get the modeline from the first n-lines of the file
+      #
+      # Returns a String or nil
+      def self.modeline(data)
+        match = MODELINES.map { |regex| data.match(regex) }.reject(&:nil?).first
+        match[1] if match
+      end
+    end
+  end
+end
--- a/lib/linguist/tokenizer.rb
+++ b/lib/linguist/tokenizer.rb
@@ -22,8 +22,10 @@ module Linguist
    # Start state on token, ignore anything till the next newline
    SINGLE_LINE_COMMENTS = [
      '//', # C
+      '--', # Ada, Haskell, AppleScript
      '#',  # Ruby
      '%',  # Tex
+      '"',  # Vim
    ]

    # Start state on opening token, ignore anything until the closing
@@ -33,7 +35,8 @@ module Linguist
      ['<!--', '-->'], # XML
      ['{-', '-}'],    # Haskell
      ['(*', '*)'],    # Coq
-      ['"""', '"""']   # Python
+      ['"""', '"""'],  # Python
+      ["'''", "'''"]   # Python
    ]

    START_SINGLE_LINE_COMMENT =  Regexp.compile(SINGLE_LINE_COMMENTS.map { |c|
@@ -83,17 +86,17 @@ module Linguist
          if s.peek(1) == "\""
            s.getch
          else
-            s.skip_until(/[^\\]"/)
+            s.skip_until(/(?<!\\)"/)
          end
        elsif s.scan(/'/)
          if s.peek(1) == "'"
            s.getch
          else
-            s.skip_until(/[^\\]'/)
+            s.skip_until(/(?<!\\)'/)
          end

        # Skip number literals
-        elsif s.scan(/(0x)?\d(\d|\.)*/)
+        elsif s.scan(/(0x\h(\h|\.)*|\d(\d|\.)*)([uU][lL]{0,2}|([eE][-+]\d*)?[fFlL]*)/)

        # SGML style brackets
        elsif token = s.scan(/<[^\s<>][^<>]*>/)
@@ -129,6 +132,9 @@ module Linguist
    #   extract_shebang("#!/usr/bin/env node")
    #   # => "node"
    #
+    #   extract_shebang("#!/usr/bin/env A=B foo=bar awk -f")
+    #   # => "awk"
+    #
    # Returns String token or nil it couldn't be parsed.
    def extract_shebang(data)
      s = StringScanner.new(data)
@@ -137,6 +143,7 @@ module Linguist
        script = path.split('/').last
        if script == 'env'
          s.scan(/\s+/)
+          s.scan(/.*=[^\s]+\s+/)
          script = s.scan(/\S+/)
        end
        script = script[/[^\d]+/, 0] if script
--- a/lib/linguist/vendor.yml
+++ b/lib/linguist/vendor.yml
@@ -20,10 +20,20 @@
 - ^deps/
 - ^tools/
 - (^|/)configure$
- (^|/)configure.ac$
 - (^|/)config.guess$
 - (^|/)config.sub$

+# stuff autogenerated by autoconf - still C deps
+- (^|/)aclocal.m4
+- (^|/)libtool.m4
+- (^|/)ltoptions.m4
+- (^|/)ltsugar.m4
+- (^|/)ltversion.m4
+- (^|/)lt~obsolete.m4
+
+# Linters
+- cpplint.py
+
 # Node dependencies
 - node_modules/

@@ -32,17 +42,42 @@

 # Erlang bundles
 - ^rebar$
+- erlang.mk

-# Bootstrap minified css and js
- (^|/)bootstrap([^.]*)(\.min)?\.(js|css)$
+# Go dependencies
+- Godeps/_workspace/
+
+# Minified JavaScript and CSS
+- (\.|-)min\.(js|css)$
+
+# Stylesheets imported from packages
+- ([^\s]*)import\.(css|less|scss|styl)$
+
+# Bootstrap css and js
+- (^|/)bootstrap([^.]*)\.(js|css|less|scss|styl)$
+- (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|styl)$
+
+# Font Awesome
+- (^|/)font-awesome\.(css|less|scss|styl)$

 # Foundation css
- foundation.min.css
- foundation.css
+- (^|/)foundation\.(css|less|scss|styl)$
+
+# Normalize.css
+- (^|/)normalize\.(css|less|scss|styl)$
+
+# Bourbon css
+- (^|/)[Bb]ourbon/.*\.(css|less|scss|styl)$
+
+# Animate.css
+- (^|/)animate\.(css|less|scss|styl)$

 # Vendored dependencies
- thirdparty/
+- third[-_]?party/
+- 3rd[-_]?party/
 - vendors?/
+- extern(al)?/
+- (^|/)[Vv]+endor/

 # Debian packaging
 - ^debian/
@@ -50,15 +85,46 @@
 # Haxelib projects often contain a neko bytecode file named run.n
 - run.n$

+# Bootstrap Datepicker
+- bootstrap-datepicker/
+
 ## Commonly Bundled JavaScript frameworks ##

 # jQuery
- (^|/)jquery([^.]*)(\.min)?\.js$
- (^|/)jquery\-\d\.\d+(\.\d+)?(\.min)?\.js$
+- (^|/)jquery([^.]*)\.js$
+- (^|/)jquery\-\d\.\d+(\.\d+)?\.js$

 # jQuery UI
- (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?(\.min)?\.(js|css)$
- (^|/)jquery\.(ui|effects)\.([^.]*)(\.min)?\.(js|css)$
+- (^|/)jquery\-ui(\-\d\.\d+(\.\d+)?)?(\.\w+)?\.(js|css)$
+- (^|/)jquery\.(ui|effects)\.([^.]*)\.(js|css)$
+
+# jQuery Gantt
+- jquery.fn.gantt.js
+
+# jQuery fancyBox
+- jquery.fancybox.(js|css)
+
+# Fuel UX
+- fuelux.js
+
+# jQuery File Upload
+- (^|/)jquery\.fileupload(-\w+)?\.js$
+
+# Slick
+- (^|/)slick\.\w+.js$
+
+# Leaflet plugins
+- (^|/)Leaflet\.Coordinates-\d+\.\d+\.\d+\.src\.js$
+- leaflet.draw-src.js
+- leaflet.draw.css
+- Control.FullScreen.css
+- Control.FullScreen.js
+- leaflet.spin.js
+- wicket-leaflet.js
+
+# Sublime Text workspace files
+- .sublime-project
+- .sublime-workspace

 # Prototype
 - (^|/)prototype(.*)\.js$
@@ -90,19 +156,38 @@
 # MathJax
 - (^|/)MathJax/

+# Chart.js
+- (^|/)Chart\.js$
+
+# Codemirror
+- (^|/)[Cc]ode[Mm]irror/(\d+\.\d+/)?(lib|mode|theme|addon|keymap|demo)
+
 # SyntaxHighlighter - http://alexgorbatchev.com/
 - (^|/)shBrush([^.]*)\.js$
 - (^|/)shCore\.js$
 - (^|/)shLegacy\.js$

 # AngularJS
- (^|/)angular([^.]*)(\.min)?\.js$
+- (^|/)angular([^.]*)\.js$
+
+# D3.js
+- (^|\/)d3(\.v\d+)?([^.]*)\.js$

 # React
- (^|/)react(-[^.]*)?(\.min)?\.js$
+- (^|/)react(-[^.]*)?\.js$
+
+# Modernizr
+- (^|/)modernizr\-\d\.\d+(\.\d+)?\.js$
+- (^|/)modernizr\.custom\.\d+\.js$
+
+# Knockout
+- (^|/)knockout-(\d+\.){3}(debug\.)?js$

 ## Python ##

+# Sphinx
+- (^|/)docs?/_?(build|themes?|templates?|static)/
+
 # django
 - (^|/)admin_media/

@@ -117,9 +202,31 @@

 ## Obj-C ##

+# Xcode
+
+- \.xctemplate/
+- \.imageset/
+
+# Carthage
+- ^Carthage/
+
+# Cocoapods
+- ^Pods/
+
 # Sparkle
 - (^|/)Sparkle/

+# Crashlytics
+- Crashlytics.framework/
+
+# Fabric
+- Fabric.framework/
+
+# git config files
+- gitattributes$
+- gitignore$
+- gitmodules$
+
 ## Groovy ##

 # Gradle
@@ -134,14 +241,14 @@
 - \.intellisense\.js$

 # jQuery validation plugin (MS bundles this with asp.net mvc)
- (^|/)jquery([^.]*)\.validate(\.unobtrusive)?(\.min)?\.js$
- (^|/)jquery([^.]*)\.unobtrusive\-ajax(\.min)?\.js$
+- (^|/)jquery([^.]*)\.validate(\.unobtrusive)?\.js$
+- (^|/)jquery([^.]*)\.unobtrusive\-ajax\.js$

 # Microsoft Ajax
 - (^|/)[Mm]icrosoft([Mm]vc)?([Aa]jax|[Vv]alidation)(\.debug)?\.js$

 # NuGet
- ^[Pp]ackages/
+- ^[Pp]ackages\/.+\.\d+\/

 # ExtJS
 - (^|/)extjs/.*?\.js$
@@ -161,31 +268,47 @@
 - (^|/)extjs/src/
 - (^|/)extjs/welcome/

-# Samples folders
- ^[Ss]amples/
-
-# LICENSE, README, git config files
- ^COPYING$
- LICENSE$
- License$
- gitattributes$
- gitignore$
- gitmodules$
- ^README$
- ^readme$
+# Html5shiv
+- (^|/)html5shiv\.js$

 # Test fixtures
- ^[Tt]est/fixtures/
+- ^[Tt]ests?/fixtures/
+- ^[Ss]pecs?/fixtures/

 # PhoneGap/Cordova
- (^|/)cordova([^.]*)(\.min)?\.js$
- (^|/)cordova\-\d\.\d(\.\d)?(\.min)?\.js$
+- (^|/)cordova([^.]*)\.js$
+- (^|/)cordova\-\d\.\d(\.\d)?\.js$
+
+# Foundation js
+- foundation(\..*)?\.js$

 # Vagrant
 - ^Vagrantfile$

-# .DS_Store's
+# .DS_Stores
 - .[Dd][Ss]_[Ss]tore$

-# Mercury --use-subdirs
- Mercury/
+# R packages
+- ^vignettes/
+- ^inst/extdata/
+
+# Octicons
+- octicons.css
+- sprockets-octicons.scss
+
+# Typesafe Activator
+- (^|/)activator$
+- (^|/)activator\.bat$
+
+# ProGuard
+- proguard.pro
+- proguard-rules.pro
+
+# PuPHPet
+- ^puphpet/
+
+# Android Google APIs
+- (^|/)\.google_apis/
+
+# Jenkins Pipeline
+- ^Jenkinsfile$
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "2.10.15"
+  VERSION = "4.8.2"
 end
--- a/package.json
+++ b/package.json
@@ -0,0 +1,7 @@
+{
+  "repository": "https://github.com/github/linguist",
+  "dependencies": {
+    "season": "~>5.0"
+  },
+  "license": "MIT"
+}
--- a/Script/GlobalScript.asc
+++ b/Script/GlobalScript.asc
@@ -0,0 +1,521 @@
+// main global script file
+
+// A function that initializes a bunch of stuff.
+function initialize_control_panel() { 
+  // Centre the control panel
+  gPanel.Centre(); 
+  // Centre the Restart dialog as well
+  gRestartYN.Centre(); 
+  if (!IsSpeechVoxAvailable()) { 
+    // If there is no speech-vox file, and therefore no speech,
+    // disable all the controls related with speech.
+    lblVoice.Visible = false;  
+    btnVoice.Visible = false;  
+    sldVoice.Visible = false;
+  }
+  else {
+    // If there *is*, then set it to voice and text. It's best to use
+    // both whenever possible, for the player's sake.
+    SetVoiceMode(eSpeechVoiceAndText); 
+    // And reflect this in the control panel.
+    btnVoice.Text = "Voice and Text"; 
+  }
+  if (!System.SupportsGammaControl) {
+    // If we can't change the gamma settings, disable the relevant options.
+    sldGamma.Visible = false; 
+    lblGamma.Visible = false;
+  } 
+  
+  //And now, set all the defaults
+  System.Volume = 100;
+  sldAudio.Value = System.Volume;
+  SetGameSpeed(40);
+  sldSpeed.Value = 40;
+  if (IsSpeechVoxAvailable()) {
+     SetVoiceMode(eSpeechVoiceAndText);
+     btnVoice.Text = "Voice and Text";
+     sldVoice.Value = 255;
+     SetSpeechVolume(255);
+  }
+  if (System.SupportsGammaControl) {
+    System.Gamma = 100;
+    sldGamma.Value = 100;
+  }
+}
+
+// Called when the game starts, before the first room is loaded
+function game_start() {   
+  // Put the code all in a function and then just call the function. 
+  // It saves cluttering up places like game_start.
+  initialize_control_panel(); 
+  // Use the KeyboardMovement module to, per default, replicate the standard
+  // keyboard movement of most Sierra games. See KeyboardMovement.txt for more info
+  KeyboardMovement.SetMode(eKeyboardMovement_Tapping); 
+}
+
+function repeatedly_execute() {
+  
+  // Put here anything you want to happen every game cycle, even when
+  // the game is paused. This will not run when the game is blocked
+  // inside a command like a blocking Walk()
+  
+  if (IsGamePaused() == 1) return;
+
+  // Put here anything you want to happen every game cycle, but not
+  // when the game is paused.
+}
+
+function repeatedly_execute_always() {
+  
+  // Put anything you want to happen every game cycle, even
+  // when the game is blocked inside a command like a
+  // blocking Walk().
+  // You cannot run blocking commands from this function.
+  
+}
+
+function show_inventory_window () 
+{
+  gInventory.Visible = true;
+  // switch to the Use cursor (to select items with)
+  mouse.Mode = eModeInteract;
+  // But, override the appearance to look like the arrow
+  mouse.UseModeGraphic(eModePointer);
+}
+
+function show_save_game_dialog()
+{
+  gSaveGame.Visible = true;
+  // Get the list of save games
+  lstSaveGamesList.FillSaveGameList();
+  if (lstSaveGamesList.ItemCount > 0)
+  {
+    // If there is at least one, set the default text
+    // to be the first game's name
+    txtNewSaveName.Text = lstSaveGamesList.Items[0];
+  }
+  else
+  {
+    // No save games yet, default empty text.
+    txtNewSaveName.Text = "";
+  }
+  mouse.UseModeGraphic(eModePointer);
+  gIconbar.Visible = false;
+}
+
+function show_restore_game_dialog()
+{
+  gRestoreGame.Visible = true;
+  lstRestoreGamesList.FillSaveGameList();
+  mouse.UseModeGraphic(eModePointer);
+  gIconbar.Visible = false;
+}
+
+function close_save_game_dialog()
+{
+  gSaveGame.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+}
+
+function close_restore_game_dialog()
+{
+  gRestoreGame.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+}
+
+// Called when a key is pressed. keycode holds the key's ASCII code
+function on_key_press(eKeyCode keycode) {
+  // The following is called before "if game is paused keycode=0", so
+  // it'll happen even when the game is paused.
+  
+  if ((keycode == eKeyEscape) && gRestartYN.Visible) {
+    //Use ESC to cancel restart.
+    gRestartYN.Visible = false; 
+    gIconbar.Visible = true;
+    // If the panel's not ON, then the player must have gotten here by tapping F9,
+    // therefore his cursor needs restoring. If the panel IS on, then it doesn't,
+    // because it's already a pointer. Get used to thinking like this!!
+    if (!gPanel.Visible) mouse.UseDefaultGraphic(); 
+    return;
+  }
+  if ((keycode == eKeyEscape) && gPanel.Visible) {
+    // Use ESC to turn the panel off.
+    gPanel.Visible = false; 
+    mouse.UseDefaultGraphic();
+    gIconbar.Visible = true;
+    return;
+  }
+  if ((keycode == eKeyEscape) && (gSaveGame.Visible))
+  {
+    // Use ESC to close the save game dialog
+    close_save_game_dialog();
+    return;
+  }
+  if ((keycode == eKeyEscape) && (gRestoreGame.Visible))
+  {
+    // Use ESC to close the restore game dialog
+    close_restore_game_dialog();
+    return;
+  }
+  
+  if (keycode == eKeyReturn) { 
+    // ENTER, in this case merely confirms restart
+    if (gRestartYN.Visible) RestartGame();
+  }
+
+  if (IsGamePaused() || (IsInterfaceEnabled() == 0))
+  {
+    // If the game is paused with a modal GUI on the
+    // screen, or the player interface is disabled in
+    // a cut scene, ignore any keypresses.
+    return;
+  }
+
+  // FUNCTION KEYS AND SYSTEM SHORTCUTS
+  if (keycode == eKeyEscape) {
+    // ESC
+    gPanel.Visible = true; 
+    gIconbar.Visible = false;
+    mouse.UseModeGraphic(eModePointer);
+  }
+  if (keycode == eKeyCtrlQ)  QuitGame(1);   // Ctrl-Q
+  if (keycode == eKeyF5) show_save_game_dialog();   // F5
+  if (keycode == eKeyF7) show_restore_game_dialog();  // F7
+  if (keycode == eKeyF9) {
+    // F9, asks the player to confirm restarting (so much better to always confirm first)
+    gRestartYN.Visible = true;  
+    gIconbar.Visible = false;
+    mouse.UseModeGraphic(eModePointer);
+  }
+  if (keycode == eKeyF12) SaveScreenShot("scrnshot.bmp");  // F12
+  if (keycode == eKeyTab)   show_inventory_window();  // Tab, show inventory
+
+  // GAME COMMAND SHORTCUTS
+  if (keycode == 'W') mouse.Mode=eModeWalkto; //Notice this alternate way to indicate keycodes.
+  if (keycode == 'L') mouse.Mode=eModeLookat; //Note that all we do here is set modes.
+  if (keycode == 'U') mouse.Mode=eModeInteract; //If you want something else to happen, such as GUI buttons highlighting,
+  if (keycode == 'T') mouse.Mode=eModeTalkto; //you'll need some more scripting done.
+  if (keycode == 'I') mouse.Mode=eModeUseinv; //But this will, as-is, give you some standard keyboard shortcuts your players will very much appreciate.
+
+  // For extra cursor modes, such as pick up, feel free to add as you will.
+  // Uncomment the line below if you use the "Pick Up" mode.
+  //if (keycode == 'P' || keycode == 'G') mouse.Mode=eModePickup; 
+
+  // DEBUG FUNCTIONS
+  if (keycode == eKeyCtrlS)  Debug(0,0);  // Ctrl-S, give all inventory
+  if (keycode == eKeyCtrlV)  Debug(1,0);  // Ctrl-V, version
+  if (keycode == eKeyCtrlA)  Debug(2,0);  // Ctrl-A, show walkable areas
+  if (keycode == eKeyCtrlX)  Debug(3,0);  // Ctrl-X, teleport to room
+  if (keycode == eKeyCtrlW && game.debug_mode) 
+    player.PlaceOnWalkableArea(); //Ctrl-W, move to walkable area 
+}
+
+
+function on_mouse_click(MouseButton button) {
+  // called when a mouse button is clicked. button is either LEFT or RIGHT
+  if (IsGamePaused() == 1) {
+    // Game is paused, so do nothing (ie. don't allow mouse click)
+  }
+  else if (button == eMouseLeft) {
+    ProcessClick(mouse.x, mouse.y, mouse.Mode );
+  }
+  else if (button == eMouseRight || button == eMouseWheelSouth){
+    // right-click our mouse-wheel down, so cycle cursor
+    mouse.SelectNextMode();
+  }
+  else if (button == eMouseMiddle) { 
+    // Middle-button-click, default make character walk to clicked area (a little shortcut)
+    // Could have been just "player.Walk(mouse.x,mouse.y)", but it's best to
+    // leave our options open - what if you have a special script triggered
+    // on "walking" mode?
+    ProcessClick(mouse.x, mouse.y, eModeWalkto); 
+  }
+  else if (button == eMouseWheelNorth) { 
+    // Mouse-wheel up, cycle cursors 
+    // If mode isn't WALK, set the previous mode (notice usage of numbers instead
+    // of eNums, when it suits us)...
+    if (mouse.Mode>0) mouse.Mode=mouse.Mode-1; 
+    else 
+    { 
+      // ...but if it is WALK mode...
+      if (player.ActiveInventory!=null) 
+      {
+        //...and the player has a selected inventory item, set mouse mode to UseInv. 
+        mouse.Mode=eModeUseinv; 
+      }
+      else 
+      {
+        // If they don't, however, just set it to mode TALK (change this line if you add more cursor modes)
+        mouse.Mode=eModeTalkto; 
+      }
+    }
+  }
+}
+
+function interface_click(int interface, int button) {
+  // This function is obsolete, from 2.62 and earlier versions.
+}
+
+function btnInvUp_Click(GUIControl *control, MouseButton button) {
+  invCustomInv.ScrollUp();
+}
+
+function btnInvDown_Click(GUIControl *control, MouseButton button) {
+  invCustomInv.ScrollDown();
+}
+
+function btnInvOK_Click(GUIControl *control, MouseButton button) {
+	// They pressed the OK button, close the GUI
+	gInventory.Visible = false;
+	mouse.UseDefaultGraphic();
+}
+
+function btnInvSelect_Click(GUIControl *control, MouseButton button) {
+  
+	// They pressed SELECT, so switch to the Get cursor
+	mouse.Mode = eModeInteract;
+	// But, override the appearance to look like the arrow
+	mouse.UseModeGraphic(eModePointer);
+}
+
+function btnIconInv_Click(GUIControl *control, MouseButton button) {
+  
+  show_inventory_window();
+}
+
+function btnIconCurInv_Click(GUIControl *control, MouseButton button) {
+  
+  if (player.ActiveInventory != null)
+    mouse.Mode = eModeUseinv;
+}
+
+function btnIconSave_Click(GUIControl *control, MouseButton button) 
+{
+  show_save_game_dialog();
+}
+
+function btnIconLoad_Click(GUIControl *control, MouseButton button) 
+{
+  show_restore_game_dialog();
+}
+
+function btnIconExit_Click(GUIControl *control, MouseButton button) {
+  
+  QuitGame(1);
+}
+
+function btnIconAbout_Click(GUIControl *control, MouseButton button) {
+  
+  gPanel.Visible=true;
+  gIconbar.Visible=false;
+  mouse.UseModeGraphic(eModePointer);
+}
+
+function cEgo_Look()
+{
+  Display("Damn, I'm looking good!");
+}
+
+function cEgo_Interact()
+{
+  Display("You rub your hands up and down your clothes.");
+}
+
+function cEgo_Talk()
+{
+  Display("Talking to yourself is a sign of madness!");
+}
+
+//START OF CONTROL PANEL FUNCTIONS
+function btnSave_OnClick(GUIControl *control, MouseButton button)
+{
+  gPanel.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+  Wait(1);
+  btnIconSave_Click(btnIconSave, eMouseLeft);
+}
+
+function gControl_OnClick(GUI *theGui, MouseButton button)
+{
+
+}
+
+function btnAbout_OnClick(GUIControl *control, MouseButton button)
+{
+Display("Adventure Game Studio run-time engine default game.");
+}
+
+function btnQuit_OnClick(GUIControl *control, MouseButton button)
+{
+  gPanel.Visible = false;
+  Wait(1);
+  QuitGame(1);
+  gPanel.Visible = true;
+  gIconbar.Visible = false;
+  mouse.UseModeGraphic(eModePointer);
+}
+
+function btnLoad_OnClick(GUIControl *control, MouseButton button)
+{
+  gPanel.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+  Wait(1);
+  btnIconLoad_Click(btnIconLoad, eMouseLeft);
+}
+
+function btnResume_OnClick(GUIControl *control, MouseButton button)
+{
+  gPanel.Visible = false;
+  mouse.UseDefaultGraphic();
+  gIconbar.Visible = true;
+}
+
+function sldAudio_OnChange(GUIControl *control)
+{
+  System.Volume = sldAudio.Value;
+}
+
+function sldVoice_OnChange(GUIControl *control)
+{
+  // Sets voice volume. Note that we don't check for the existence of speech.vox - 
+  // we did that in game_start, so if it's not there the slider won't even be available.
+  SetSpeechVolume(sldVoice.Value); 
+}
+
+function btnVoice_OnClick(GUIControl *control, MouseButton button)
+{
+  // Note that we don't check for the existence of speech.vox - we did that in game_start,
+  // so if it's not there the button won't even be available.
+  if (btnVoice.Text == "Voice and Text") { 
+    SetVoiceMode(eSpeechVoiceOnly); 
+    btnVoice.Text = "Voice only";
+  }
+  else if (btnVoice.Text == "Voice only") {
+    SetVoiceMode(eSpeechTextOnly);
+    btnVoice.Text = "Text only";
+  }
+  else if (btnVoice.Text == "Text only") {
+    SetVoiceMode(eSpeechVoiceAndText);
+    btnVoice.Text = "Voice and Text";
+  }
+}
+
+function sldGamma_OnChange(GUIControl *control)
+{
+  // Set the gamma. Note there's no need to check for anything else, as we ensured,
+  // in game_start, that the slider won't even appear if it's not possible to do this.
+  System.Gamma = sldGamma.Value; 
+}
+
+function btnDefault_OnClick(GUIControl *control, MouseButton button)
+{
+  // Reset everything to default. You'll have to edit these as well as the sliders
+  // if you'd rather have different default parameters.
+  System.Volume = 100;
+  sldAudio.Value = System.Volume;
+  sldSpeed.Value = 40;
+  SetGameSpeed(40);
+  if (IsSpeechVoxAvailable()) {
+     SetVoiceMode(eSpeechVoiceAndText);
+     btnVoice.Text = "Voice and Text";
+     sldVoice.Value = 255;
+     SetSpeechVolume(255);
+  }
+  if (System.SupportsGammaControl) {
+    System.Gamma = 100;
+    sldGamma.Value = 100;
+  }
+}
+//END OF CONTROL PANEL FUNCTIONS
+
+function dialog_request(int param) 
+{
+  // This is used by the dialog text parser if you need to process
+  // text that the player types in to the parser.
+  // It is not used by default.
+}
+
+function sldSpeed_OnChange(GUIControl *control)
+{
+  SetGameSpeed(sldSpeed.Value);
+}
+
+function btnRestart_OnClick(GUIControl *control, MouseButton button)
+{
+  gRestartYN.Visible=true;
+  gIconbar.Visible=false;
+}
+
+function btnRestartYes_OnClick(GUIControl *control, MouseButton button)
+{
+  RestartGame();
+}
+
+function btnRestartNo_OnClick(GUIControl *control, MouseButton button)
+{
+  gRestartYN.Visible = false;
+  gIconbar.Visible = true;
+  // If the panel's not ON, then the player must have gotten here by tapping F9,
+  // therefore his cursor needs restoring. If the panel IS on, then it doesn't,
+  // because it's already a pointer. Get used to thinking like this!!
+  if (!gPanel.Visible) mouse.UseDefaultGraphic(); 
+}
+
+function btnCancelSave_OnClick(GUIControl *control, MouseButton button)
+{
+  close_save_game_dialog();
+}
+
+function btnSaveGame_OnClick(GUIControl *control, MouseButton button)
+{
+  int gameSlotToSaveInto = lstSaveGamesList.ItemCount + 1;
+  int i = 0;
+  while (i < lstSaveGamesList.ItemCount)
+  {
+    if (lstSaveGamesList.Items[i] == txtNewSaveName.Text)
+    {
+      gameSlotToSaveInto = lstSaveGamesList.SaveGameSlots[i];
+    }
+    i++;
+  }
+  SaveGameSlot(gameSlotToSaveInto, txtNewSaveName.Text);
+  close_save_game_dialog();
+}
+
+function btnCancelRestore_OnClick(GUIControl *control, MouseButton button)
+{
+  close_restore_game_dialog();
+}
+
+function btnRestoreGame_OnClick(GUIControl *control, MouseButton button)
+{
+  if (lstRestoreGamesList.SelectedIndex >= 0)
+  {
+    RestoreGameSlot(lstRestoreGamesList.SaveGameSlots[lstRestoreGamesList.SelectedIndex]);
+  }
+  close_restore_game_dialog();
+}
+
+function lstSaveGamesList_OnSelectionCh(GUIControl *control)
+{
+  txtNewSaveName.Text = lstSaveGamesList.Items[lstSaveGamesList.SelectedIndex];
+}
+
+function txtNewSaveName_OnActivate(GUIControl *control)
+{
+  // Pressing return in the text box simulates clicking the Save button
+  btnSaveGame_OnClick(control, eMouseLeft);
+}
+
+function btnDeleteSave_OnClick(GUIControl *control, MouseButton button)
+{
+  if (lstSaveGamesList.SelectedIndex >= 0)
+  {
+    DeleteSaveSlot(lstSaveGamesList.SaveGameSlots[lstSaveGamesList.SelectedIndex]);
+    lstSaveGamesList.FillSaveGameList();
+  }
+}
--- a/Script/GlobalScript.ash
+++ b/Script/GlobalScript.ash
@@ -0,0 +1,4 @@
+// Main header script - this will be included into every script in
+// the game (local and global). Do not place functions here; rather,
+// place import definitions and #define names here to be used by all
+// scripts.
--- a/Script/KeyboardMovement_102.asc
+++ b/Script/KeyboardMovement_102.asc
@@ -0,0 +1,216 @@
+// Main script for module 'KeyboardMovement'
+
+//****************************************************************************************************
+// DEFINITIONS
+//****************************************************************************************************
+
+#define DISTANCE 10000// distance player walks in Tapping mode before he stops
+
+enum KeyboardMovement_Directions {
+	eKeyboardMovement_Stop, 
+	eKeyboardMovement_DownLeft, 
+	eKeyboardMovement_Down, 
+	eKeyboardMovement_DownRight, 
+	eKeyboardMovement_Left, 
+	eKeyboardMovement_Right, 
+	eKeyboardMovement_UpLeft, 
+	eKeyboardMovement_Up, 
+	eKeyboardMovement_UpRight
+};
+
+//****************************************************************************************************
+// VARIABLES
+//****************************************************************************************************
+
+// keycodes as variables for future key customization functions (static variables?):
+int KeyboardMovement_KeyDown = 380; // down arrow
+int KeyboardMovement_KeyLeft = 375; // left arrow
+int KeyboardMovement_KeyRight = 377; // right arrow
+int KeyboardMovement_KeyUp = 372; // up arrow
+int KeyboardMovement_KeyDownRight = 381; // PgDn (numpad)
+int KeyboardMovement_KeyUpRight = 373; // PgUp (numpad)
+int KeyboardMovement_KeyDownLeft = 379; // End (numpad)
+int KeyboardMovement_KeyUpLeft = 371; // Home (numpad)
+int KeyboardMovement_KeyStop = 376; // 5 (numpad)
+
+KeyboardMovement_Modes KeyboardMovement_Mode = eKeyboardMovement_None; // stores current keyboard control mode (disabled by default)
+
+KeyboardMovement_Directions KeyboardMovement_CurrentDirection = eKeyboardMovement_Stop; // stores current walking direction of player character
+
+//****************************************************************************************************
+// USER FUNCTIONS
+//****************************************************************************************************
+
+//====================================================================================================
+
+static function KeyboardMovement::SetMode(KeyboardMovement_Modes mode) {
+	KeyboardMovement_Mode = mode;
+}
+
+//====================================================================================================
+
+// key customization functions here
+
+//====================================================================================================
+
+//****************************************************************************************************
+// EVENT HANDLER FUNCTIONS
+//****************************************************************************************************
+
+//====================================================================================================
+
+function repeatedly_execute() {
+
+	//--------------------------------------------------
+	// Pressing mode
+	//--------------------------------------------------
+
+	if ((IsGamePaused() == true) || (KeyboardMovement_Mode != eKeyboardMovement_Pressing) || (IsInterfaceEnabled() == false) || (player.on == false)) return 0;
+	  // if game is paused, module or mode disabled, interface disabled or player character hidden, quit function
+
+	KeyboardMovement_Directions newdirection; // declare variable storing new direction
+
+	// get new direction:
+	if ( ((IsKeyPressed(KeyboardMovement_KeyDown)) && (IsKeyPressed(KeyboardMovement_KeyRight))) || (IsKeyPressed(KeyboardMovement_KeyDownRight)) ) newdirection = eKeyboardMovement_DownRight; // if down&right arrows or PgDn (numeric pad) held down, set new direction to Down-Right
+	else if ( ((IsKeyPressed(KeyboardMovement_KeyUp)) && (IsKeyPressed(KeyboardMovement_KeyRight))) || (IsKeyPressed(KeyboardMovement_KeyUpRight)) ) newdirection = eKeyboardMovement_UpRight; // up&right arrows or PgUp (numpad)
+	else if ( ((IsKeyPressed(KeyboardMovement_KeyDown)) && (IsKeyPressed(KeyboardMovement_KeyLeft))) || (IsKeyPressed(KeyboardMovement_KeyDownLeft)) ) newdirection = eKeyboardMovement_DownLeft; // down&left arrows or End (numpad)
+	else if ( ((IsKeyPressed(KeyboardMovement_KeyUp)) && (IsKeyPressed(KeyboardMovement_KeyLeft))) || (IsKeyPressed(KeyboardMovement_KeyUpLeft)) ) newdirection = eKeyboardMovement_UpLeft; // up&left arrows or Home (numpad)
+	else if (IsKeyPressed(KeyboardMovement_KeyDown)) newdirection = eKeyboardMovement_Down; // down arrow
+	else if (IsKeyPressed(KeyboardMovement_KeyLeft)) newdirection = eKeyboardMovement_Left; // left arrow
+	else if (IsKeyPressed(KeyboardMovement_KeyRight)) newdirection = eKeyboardMovement_Right; // right arrow
+	else if (IsKeyPressed(KeyboardMovement_KeyUp)) newdirection = eKeyboardMovement_Up; // up arrow
+	else newdirection = eKeyboardMovement_Stop; // if none of the above held down, set it to stop player character
+
+	if (IsKeyPressed(KeyboardMovement_KeyStop)) newdirection = eKeyboardMovement_Stop; // if 5 (numeric pad) held down, stop player character, regardless of whether some of the above are held down
+
+	if (newdirection != KeyboardMovement_CurrentDirection) { // if new direction is different from current direction
+
+		if (newdirection == eKeyboardMovement_Stop) player.StopMoving(); // if new direction is the Stop command, stop movement of player character
+		else { // if new direction is NOT the Stop command
+
+			int dx, dy; // declare variables storing new walk coordinates
+			if (newdirection == eKeyboardMovement_DownRight) {
+				dx = DISTANCE;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_UpRight) {
+				dx = DISTANCE;
+				dy = -DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_DownLeft) {
+				dx = -DISTANCE;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_UpLeft) {
+				dx = -DISTANCE;
+				dy = -DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_Down) {
+				dx = 0;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_Left) {
+				dx = -DISTANCE;
+				dy = 0;
+			}
+			else if (newdirection == eKeyboardMovement_Right) {
+				dx = DISTANCE;
+				dy = 0;
+			}
+			else if (newdirection == eKeyboardMovement_Up) {
+				dx = 0;
+				dy = -DISTANCE;
+			}
+
+			player.WalkStraight(player.x + dx, player.y + dy, eNoBlock); // walk player character to the new coordinates
+		}
+		KeyboardMovement_CurrentDirection = newdirection; // update current direction to new direction
+
+	}
+
+}
+
+//====================================================================================================
+
+function on_key_press(int keycode) {
+
+	//--------------------------------------------------
+	// Tapping mode
+	//--------------------------------------------------
+
+	if ((IsGamePaused() == true) || (KeyboardMovement_Mode != eKeyboardMovement_Tapping) || (IsInterfaceEnabled() == false) || (player.on == false)) return 0;
+	  // if game is paused, module or mode disabled, interface disabled or player character hidden, quit function
+
+	KeyboardMovement_Directions newdirection; // declare variable storing new direction
+
+	// get new direction:
+	if (keycode == KeyboardMovement_KeyDownRight) newdirection = eKeyboardMovement_DownRight; // if down-right key pressed, set new direction to Down-Right
+	else if (keycode == KeyboardMovement_KeyUpRight) newdirection = eKeyboardMovement_UpRight;
+	else if (keycode == KeyboardMovement_KeyDownLeft) newdirection = eKeyboardMovement_DownLeft;
+	else if (keycode == KeyboardMovement_KeyUpLeft) newdirection = eKeyboardMovement_UpLeft;
+	else if (keycode == KeyboardMovement_KeyDown) newdirection = eKeyboardMovement_Down;
+	else if (keycode == KeyboardMovement_KeyLeft) newdirection = eKeyboardMovement_Left;
+	else if (keycode == KeyboardMovement_KeyRight) newdirection = eKeyboardMovement_Right;
+	else if (keycode == KeyboardMovement_KeyUp) newdirection = eKeyboardMovement_Up;
+	else if (keycode == KeyboardMovement_KeyStop) newdirection = eKeyboardMovement_Stop; // if stop key pressed, set to stop player character
+
+	if (newdirection != KeyboardMovement_CurrentDirection) { // if new direction is different from current direction
+
+		if (newdirection == eKeyboardMovement_Stop) player.StopMoving(); // if new direction is the Stop command, stop movement of player character
+		else { // if new direction is NOT the Stop command
+
+			int dx, dy; // declare variables storing new walk coordinates
+			if (newdirection == eKeyboardMovement_DownRight) {
+				dx = DISTANCE;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_UpRight) {
+				dx = DISTANCE;
+				dy = -DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_DownLeft) {
+				dx = -DISTANCE;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_UpLeft) {
+				dx = -DISTANCE;
+				dy = -DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_Down) {
+				dx = 0;
+				dy = DISTANCE;
+			}
+			else if (newdirection == eKeyboardMovement_Left) {
+				dx = -DISTANCE;
+				dy = 0;
+			}
+			else if (newdirection == eKeyboardMovement_Right) {
+				dx = DISTANCE;
+				dy = 0;
+			}
+			else if (newdirection == eKeyboardMovement_Up) {
+				dx = 0;
+				dy = -DISTANCE;
+			}
+
+			player.WalkStraight(player.x + dx, player.y + dy, eNoBlock); // walk player character to the new coordinates
+		}
+		KeyboardMovement_CurrentDirection = newdirection; // update current direction to new direction
+
+	}
+	else { // if new direction is same as current direction
+		player.StopMoving(); // stop player character
+		KeyboardMovement_CurrentDirection = eKeyboardMovement_Stop; // update current direction
+	}
+
+}
+
+//====================================================================================================
+
+function on_event(EventType event, int data) {
+
+	if (event == eEventLeaveRoom) KeyboardMovement_CurrentDirection = eKeyboardMovement_Stop;
+
+}
+
+//====================================================================================================
--- a/Script/KeyboardMovement_102.ash
+++ b/Script/KeyboardMovement_102.ash
@@ -0,0 +1,13 @@
+// Script header for module 'KeyboardMovement'
+
+#define KeyboardMovement_VERSION 101
+
+enum KeyboardMovement_Modes {
+	eKeyboardMovement_None, 
+	eKeyboardMovement_Tapping, 
+	eKeyboardMovement_Pressing
+};
+
+struct KeyboardMovement {
+	import static function SetMode(KeyboardMovement_Modes mode);
+};
--- a/samples/AMPL/CT2.mod
+++ b/samples/AMPL/CT2.mod
@@ -0,0 +1,58 @@
+param num_beams;                  # number of beams
+
+param num_rows >= 1, integer;     # number of rows
+param num_cols >= 1, integer;     # number of columns 
+
+set BEAMS   := 1 .. num_beams;    # set of beams
+
+set ROWS    := 1 .. num_rows;	  # set of rows
+set COLUMNS := 1 .. num_cols;	  # set of columns
+
+# values for entries of each beam
+param beam_values {BEAMS, ROWS, COLUMNS} >= 0; 
+
+# values of tumor
+param tumor_values {ROWS, COLUMNS} >= 0; 
+
+# values of critical area
+param critical_values {ROWS, COLUMNS} >= 0; 
+
+# critical maximum dosage requirement
+param critical_max;
+
+# tumor minimum dosage requirement
+param tumor_min;
+
+# dosage scalar of each beam
+var X {i in BEAMS} >= 0;
+
+
+# define the tumor area which includes the locations where tumor exists
+set tumor_area := {k in ROWS, h in COLUMNS: tumor_values[k,h] > 0};
+
+# define critical area 
+set critical_area := {k in ROWS, h in COLUMNS: critical_values[k,h] > 0};
+
+var S {(k,h) in tumor_area} >= 0;
+var T {(k,h) in critical_area} >= 0;
+
+# maximize total dosage in tumor area
+maximize total_tumor_dosage: sum {i in BEAMS} sum {(k,h) in tumor_area} X[i] * beam_values[i,k,h];
+
+# minimize total dosage in critical area
+minimize total_critical_dosage: sum {i in BEAMS} sum {(k,h) in critical_area} X[i] * beam_values[i,k,h];
+
+# minimize total tumor slack
+minimize total_tumor_slack: sum {(k,h) in tumor_area} S[k,h];
+
+# minimize total critical area slack
+minimize total_critical_slack: sum {(k,h) in critical_area} T[k,h];
+
+# total dosage at each tumor location [k,h] should be >= min tumor dosage with slack variable
+subject to tumor_limit {(k,h) in tumor_area} : sum {i in BEAMS} X[i] * beam_values[i,k,h] == tumor_min - S[k,h];
+
+# total dosage at each critical location [k,h] should be = max critical dosage with slack variable
+subject to critical_limit {(k,h) in critical_area} : sum {i in BEAMS} X[i] * beam_values[i,k,h] == critical_max + T[k,h];
+
+
+
--- a/samples/AMPL/toy.ampl
+++ b/samples/AMPL/toy.ampl
@@ -0,0 +1,25 @@
+# A toy knapsack problem from the LocalSolver docs written in AMPL.
+
+set I;
+param Value{I};
+param Weight{I};
+param KnapsackBound;
+var Take{I} binary;
+
+maximize TotalValue: sum{i in I} Take[i] * Value[i];
+s.t. WeightLimit: sum{i in I} Take[i] * Weight[i] <= KnapsackBound;
+
+data;
+
+param:
+I: Weight Value :=
+0    10     1
+1    60    10
+2    30    15
+3    40    40
+4    30    60
+5    20    90
+6    20   100
+7     2    15;
+
+param KnapsackBound := 102;
--- a/Blueprint/actions.apib
+++ b/Blueprint/actions.apib
@@ -0,0 +1,55 @@
+FORMAT: 1A
+
+# Advanced Action API
+A resource action is – in fact – a state transition. This API example demonstrates an action - state transition - to another resource.
+
+## API Blueprint
+ [Previous: Resource Model](11.%20Resource%20Model.md)
+ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/11.%20Advanced%20Action.md)
+
+# Tasks [/tasks/tasks{?status,priority}]
+
+ Parameters
+    + status (string)
+    + priority (number)
+
+## List All Tasks [GET]
+
+ Response 200 (application/json)
+
+        [
+            {
+                "id": 123,
+                "name": "Exercise in gym",
+                "done": false,
+                "type": "task"
+            },
+            {
+                "id": 124,
+                "name": "Shop for groceries",
+                "done": true,
+                "type": "task"
+            }
+        ]
+
+## Retrieve Task [GET /task/{id}]
+This is a state transition to another resource
+
+ Parameters
+    + id (string)
+
+ Response 200 (application/json)
+
+        {
+            "id": 123,
+            "name": "Go to gym",
+            "done": false,
+            "type": "task"
+        }
+
+## Delete Task [DELETE /task/{id}]
+
+ Parameters
+    + id (string)
+
+ Response 204
--- a/Blueprint/attributes.apib
+++ b/Blueprint/attributes.apib
@@ -0,0 +1,39 @@
+FORMAT: 1A
+
+# Attributes API
+This API example demonstrates how to describe body attributes of a request or response message.
+
+In this case, the description is complementary (and duplicate!) to the provided JSON example in the body section. The [Advanced Attributes](09.%20Advanced%20Attributes.md) API example will demonstrate how to avoid duplicates and how to reuse attributes descriptions.
+
+## API Blueprint
+ [Previous: Parameters](07.%20Parameters.md)
+ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/08.%20Attributes.md)
+ [Next: Advanced Attributes](09.%20Advanced%20Attributes.md)
+
+# Group Coupons
+
+## Coupon [/coupons/{id}]
+A coupon contains information about a percent-off or amount-off discount you might want to apply to a customer.
+
+### Retrieve a Coupon [GET]
+Retrieves the coupon with the given ID.
+
+ Response 200 (application/json)
+
+    + Attributes (object)
+        + id: 250FF (string)
+        + created: 1415203908 (number) - Time stamp
+        + percent_off: 25 (number)
+
+            A positive integer between 1 and 100 that represents the discount the coupon will apply.
+
+        + redeem_by (number) - Date after which the coupon can no longer be redeemed
+
+    + Body
+
+            {
+                "id": "250FF",
+                "created": 1415203908,
+                "percent_off": 25,
+                "redeem_by:" null
+            }
--- a/Blueprint/simple.apib
+++ b/Blueprint/simple.apib
@@ -0,0 +1,18 @@
+FORMAT: 1A
+
+# The Simplest API
+This is one of the simplest APIs written in the **API Blueprint**.
+One plain resource combined with a method and that's it! We will explain what is going on in the next installment - [Resource and Actions](02.%20Resource%20and%20Actions.md).
+
+**Note:** As we progress through the examples, do not also forget to view the [Raw](https://raw.github.com/apiaryio/api-blueprint/master/examples/01.%20Simplest%20API.md) code to see what is really going on in the API Blueprint, as opposed to just seeing the output of the Github Markdown parser.
+
+Also please keep in mind that every single example in this course is a **real API Blueprint** and as such you can **parse** it with the [API Blueprint parser](https://github.com/apiaryio/drafter) or one of its [bindings](https://github.com/apiaryio/drafter#bindings).
+
+## API Blueprint
+ [This: Raw API Blueprint](https://raw.github.com/apiaryio/api-blueprint/master/examples/01.%20Simplest%20API.md)
+ [Next: Resource and Actions](02.%20Resource%20and%20Actions.md)
+
+# GET /message
+ Response 200 (text/plain)
+
+        Hello World!
--- a/samples/APL/DeepakChopra.apl
+++ b/samples/APL/DeepakChopra.apl
@@ -0,0 +1,18 @@
+⍝   You can try this at http://tryapl.org/
+⍝   I can not explain how much I suddenly love this crypto-language
+
+
+
+Starts     ← 'Experiential truth ' 'The physical world ' 'Non-judgment '       'Quantum physics '
+Middles    ← 'nurtures an '        'projects onto '      'imparts reality to ' 'constructs with '
+Qualifiers ← 'abundance of '       'the barrier of '     'self-righteous '     'potential '
+Finishes   ← 'marvel.'             'choices.'            'creativity.'         'actions.'
+
+rf     ← {(?⍴⍵)⊃⍵}
+erf    ← {rf ¨ ⍵}
+
+deepak ← {erf Starts Middles Qualifiers Finishes}
+
+
+
+deepak ⍬
--- a/samples/APL/UT.dyalog
+++ b/samples/APL/UT.dyalog
@@ -0,0 +1,367 @@
+:NameSpace UT
+
+    sac ← 0
+    expect_orig ← expect ← ⎕NS⍬
+    exception ← ⍬
+    nexpect_orig ← nexpect ← ⎕NS⍬
+
+    ∇ {Z}←{Conf}run Argument;PRE_test;POST_test;TEST_step;COVER_step;FromSpace
+     
+      load_display_if_not_already_loaded
+      load_salt_scripts_into_current_namespace_if_configured
+     
+      FromSpace←1⊃⎕RSI
+     
+      PRE_test←{}
+      POST_test←{}
+      COVER_step←{}
+      :If 0≠⎕NC'Conf'
+          :If Conf has'cover_target'
+              PRE_test←{{}⎕PROFILE'start'}
+              POST_test←{{}⎕PROFILE'stop'}
+          :EndIf
+      :EndIf
+     
+      :If is_function Argument
+          TEST_step←single_function_test_function
+          COVER_file←Argument,'_coverage.html'
+     
+      :ElseIf is_list_of_functions Argument
+          TEST_step←list_of_functions_test_function
+          COVER_file←'list_coverage.html'
+     
+      :ElseIf is_file Argument
+          TEST_step←file_test_function
+          COVER_file←(get_file_name Argument),'_coverage.html'
+     
+      :ElseIf is_dir Argument
+          test_files←test_files_in_dir Argument
+          TEST_step←test_dir_function
+          Argument←test_files
+      :EndIf
+     
+      :If 0≠⎕NC'Conf'
+          :If Conf has'cover_target'
+              COVER_step←{Conf,←⊂('cover_file'COVER_file)
+                  generate_coverage_page Conf}
+          :EndIf
+      :EndIf
+     
+      PRE_test ⍬
+      Z←FromSpace TEST_step Argument
+      POST_test ⍬
+      COVER_step ⍬
+    ∇
+
+    ∇ load_display_if_not_already_loaded
+      :If 0=⎕NC'#.DISPLAY'
+          'DISPLAY'#.⎕CY'display'
+      :EndIf
+    ∇
+
+    ∇ load_salt_scripts_into_current_namespace_if_configured
+      :If 0≠⎕NC'#.UT.appdir'
+          :If ⍬≢#.UT.appdir
+              ⎕SE.SALT.Load #.UT.appdir,'src/*.dyalog -target=#'
+              ⎕SE.SALT.Load #.UT.appdir,'test/*.dyalog -target=#'
+          :EndIf
+      :EndIf
+    ∇
+
+    ∇ Z←FromSpace single_function_test_function TestName
+      Z←run_ut FromSpace TestName
+    ∇
+
+    ∇ Z←FromSpace list_of_functions_test_function ListOfNames;t
+      t←⎕TS
+      Z←run_ut¨{FromSpace ⍵}¨ListOfNames
+      t←⎕TS-t
+      ('Test execution report')print_passed_crashed_failed Z t
+    ∇
+
+    ∇ Z←FromSpace file_test_function FilePath;FileNS;Functions;TestFunctions;t
+      FileNS←⎕SE.SALT.Load FilePath,' -target=#'
+      Functions←↓FileNS.⎕NL 3
+      TestFunctions←(is_test¨Functions)/Functions
+      :If (0/⍬,⊂0/'')≡TestFunctions
+          ⎕←'No test functions found'
+          Z←⍬
+      :Else
+          t←⎕TS
+          Z←run_ut¨{FileNS ⍵}¨TestFunctions
+          t←⎕TS-t
+          (FilePath,' tests')print_passed_crashed_failed Z t
+      :EndIf
+    ∇
+
+    ∇ Z←FromSpace test_dir_function Test_files
+      :If Test_files≡⍬/⍬,⊂''
+          ⎕←'No test files found'
+          Z←⍬
+      :Else
+          Z←#.UT.run¨Test_files
+      :EndIf
+    ∇
+
+    ∇ Z←get_file_name Argument;separator
+      separator←⊃⌽(Argument∊'/\')/⍳⍴Argument
+      Z←¯7↓separator↓Argument
+    ∇
+
+    ∇ generate_coverage_page Conf;ProfileData;CoverResults;HTML
+      ProfileData←⎕PROFILE'data'
+      ToCover←retrieve_coverables¨(⊃'cover_target'in Conf)
+      :If (⍴ToCover)≡(⍴⊂1)
+          ToCover←⊃ToCover
+      :EndIf
+      Representations←get_representation¨ToCover
+      CoverResults←ProfileData∘generate_cover_result¨↓ToCover,[1.5]Representations
+      HTML←generate_html CoverResults
+      Conf write_html_to_page HTML
+      ⎕PROFILE'clear'
+    ∇
+
+    ∇ Z←retrieve_coverables Something;nc;functions
+      nc←⎕NC Something
+      :If nc=3
+          Z←Something
+      :ElseIf nc=9
+          functions←strip¨↓⍎Something,'.⎕NL 3'
+          Z←{(Something,'.',⍵)}¨functions
+      :EndIf
+    ∇
+
+    ∇ Z←strip input
+      Z←(input≠' ')/input
+    ∇
+
+    ∇ Z←get_representation Function;nc;rep
+      nc←⎕NC⊂Function
+      :If nc=3.1
+          rep←↓⎕CR Function
+          rep[1]←⊂'∇',⊃rep[1]
+          rep,←⊂'∇'
+          rep←↑rep
+      :Else
+          rep←⎕CR Function
+      :EndIf
+      Z←rep
+    ∇
+
+    ∇ Z←ProfileData generate_cover_result(name representation);Indices;lines;functionlines;covered_lines
+      Indices←({name≡⍵}¨ProfileData[;1])/⍳⍴ProfileData[;1]
+      lines←ProfileData[Indices;2]
+      nc←⎕NC⊂name
+      :If 3.1=nc
+          functionlines←¯2+⍴↓representation
+      :Else
+          functionlines←⊃⍴↓representation
+      :EndIf
+      covered_lines←(⍬∘≢¨lines)/lines
+      Z←(nc lines functionlines covered_lines representation)
+    ∇
+
+    ∇ Z←generate_html CoverResults;Covered;Total;Percentage;CoverageText;ColorizedCode;Timestamp;Page
+      Covered←⊃⊃+/{⍴4⊃⍵}¨CoverResults
+      Total←⊃⊃+/{3⊃⍵}¨CoverResults
+      Percentage←100×Covered÷Total
+      CoverageText←'Coverage: ',Percentage,'% (',Covered,'/',Total,')'
+      ColorizedCode←⊃,/{colorize_code_by_coverage ⍵}¨CoverResults
+      Timestamp←generate_timestamp_text
+      Page←⍬
+      Page,←⊂⍬,'<html>'
+      Page,←⊂⍬,'<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>'
+      Page,←⊂⍬,'<style>pre cov {line-height:80%;}'
+      Page,←⊂⍬,'pre cov {color: green;}'
+      Page,←⊂⍬,'pre uncov {line-height:80%;}'
+      Page,←⊂⍬,'pre uncov {color:red;}</style>'
+      Page,←⊂⍬,CoverageText
+      Page,←⊂⍬,'<pre>'
+      Page,←ColorizedCode
+      Page,←⊂⍬,'</pre>'
+      Page,←Timestamp
+      Page,←⊂⍬,'</html>'
+      Z←Page
+    ∇
+
+    ∇ Z←colorize_code_by_coverage CoverResult;Colors;Ends;Code
+      :If 3.1=⊃CoverResult
+          Colors←(2+3⊃CoverResult)⍴⊂'<uncov>'
+          Colors[1]←⊂''
+          Colors[⍴Colors]←⊂''
+          Ends←(2+3⊃CoverResult)⍴⊂'</uncov>'
+          Ends[1]←⊂''
+          Ends[⍴Ends]←⊂''
+      :Else
+          Colors←(3⊃CoverResult)⍴⊂'<uncov>'
+          Ends←(3⊃CoverResult)⍴⊂'</uncov>'
+      :EndIf
+      Colors[1+4⊃CoverResult]←⊂'<cov>'
+      Ends[1+4⊃CoverResult]←⊂'</cov>'
+      Code←↓5⊃CoverResult
+      Z←Colors,[1.5]Code
+      Z←{⍺,(⎕UCS 13),⍵}/Z,Ends
+    ∇
+
+    ∇ Z←generate_timestamp_text;TS;YYMMDD;HHMMSS
+      TS←⎕TS
+      YYMMDD←⊃{⍺,'-',⍵}/3↑TS
+      HHMMSS←⊃{⍺,':',⍵}/3↑3↓TS
+      Z←'Page generated: ',YYMMDD,'|',HHMMSS
+    ∇
+
+    ∇ Conf write_html_to_page Page;tie;filename
+      filename←(⊃'cover_out'in Conf),(⊃'cover_file'in Conf)
+      :Trap 22
+          tie←filename ⎕NTIE 0
+          filename ⎕NERASE tie
+          filename ⎕NCREATE tie
+      :Else
+          tie←filename ⎕NCREATE 0
+      :EndTrap
+      Simple_array←⍕⊃,/Page
+      (⎕UCS'UTF-8'⎕UCS Simple_array)⎕NAPPEND tie
+    ∇
+
+    ∇ Z←is_function Argument
+      Z←'_TEST'≡¯5↑Argument
+    ∇
+
+    ∇ Z←is_list_of_functions Argument
+      Z←2=≡Argument
+    ∇
+
+    ∇ Z←is_file Argument
+      Z←'.dyalog'≡¯7↑Argument
+    ∇
+
+    ∇ Z←is_dir Argument;attr
+      :If 'Linux'≡5↑⊃'.'⎕WG'APLVersion'
+          Z←'yes'≡⊃⎕CMD'test -d ',Argument,' && echo yes || echo no'
+      :Else
+          'gfa'⎕NA'I kernel32|GetFileAttributes* <0t'
+          :If Z←¯1≠attr←gfa⊂Argument ⍝ If file exists
+              Z←⊃2 16⊤attr           ⍝ Return bit 4
+          :EndIf
+      :EndIf
+    ∇
+
+
+    ∇ Z←test_files_in_dir Argument
+      :If 'Linux'≡5↑⊃'.'⎕WG'APLVersion'
+          Z←⎕SH'find ',Argument,' -name \*_tests.dyalog'
+      :Else
+          #.⎕CY'files'
+          Z←#.Files.Dir Argument,'\*_tests.dyalog'
+          Z←(Argument,'\')∘,¨Z
+      :EndIf
+    ∇
+
+    ∇ Z←run_ut ut_data;returned;crashed;pass;crash;fail;message
+      (returned crashed time)←execute_function ut_data
+      (pass crash fail)←determine_pass_crash_or_fail returned crashed
+      message←determine_message pass fail crashed(2⊃ut_data)returned time
+      print_message_to_screen message
+      Z←(pass crash fail)
+    ∇
+
+    ∇ Z←execute_function ut_data;function;t
+      reset_UT_globals
+      function←(⍕(⊃ut_data[1])),'.',⊃ut_data[2]
+      :Trap sac
+          :If 3.2≡⎕NC⊂function
+              t←⎕TS
+              Z←(⍎function,' ⍬')0
+              t←⎕TS-t
+          :Else
+              t←⎕TS
+              Z←(⍎function)0
+              t←⎕TS-t
+          :EndIf
+     
+      :Else
+          Z←(↑⎕DM)1
+          :If exception≢⍬
+              expect←exception
+              Z[2]←0
+              t←⎕TS-t
+          :EndIf
+      :EndTrap
+      Z,←⊂t
+    ∇
+
+    ∇ reset_UT_globals
+      expect_orig ← expect← ⎕NS⍬
+      exception←⍬
+      nexpect_orig ← nexpect← ⎕NS⍬
+    ∇
+
+    ∇ Z←is_test FunctionName;wsIndex
+      wsIndex←FunctionName⍳' '
+      FunctionName←(wsIndex-1)↑FunctionName
+      Z←'_TEST'≡¯5↑FunctionName
+    ∇
+
+    ∇ Heading print_passed_crashed_failed(ArrayRes time)
+      ⎕←'-----------------------------------------'
+      ⎕←Heading
+      ⎕←'    ⍋  Passed: ',+/{1⊃⍵}¨ArrayRes
+      ⎕←'    ⍟ Crashed: ',+/{2⊃⍵}¨ArrayRes
+      ⎕←'    ⍒  Failed: ',+/{3⊃⍵}¨ArrayRes
+      ⎕←'    ○ Runtime: ',time[5],'m',time[6],'s',time[7],'ms'
+    ∇
+    
+    determine_pass_crash_or_fail←{
+      r c←⍵ ⋄ 0≠c:0 1 0 ⋄ z←(0 0 1)(1 0 0)
+      expect_orig≢expect:(⎕IO+expect≡r)⊃z ⋄ (⎕IO+nexpect≢r)⊃z
+    }
+
+    ∇ Z←determine_message(pass fail crashed name returned time)
+      :If crashed
+          Z←'CRASHED: 'failure_message name returned
+      :ElseIf pass
+          Z←'Passed ',time[5],'m',time[6],'s',time[7],'ms'
+      :Else
+          Z←'FAILED: 'failure_message name returned
+      :EndIf
+    ∇
+
+    ∇ print_message_to_screen message
+      ⎕←message
+    ∇
+
+    ∇ Z←term_to_text Term;Text;Rows
+      Text←#.DISPLAY Term
+      Rows←1⊃⍴Text
+      Z←(Rows 4⍴''),Text
+    ∇
+
+    ∇ Z←Cause failure_message(name returned);hdr;exp;expterm;got;gotterm
+      hdr←Cause,name
+      exp←'Expected'
+      expterm←term_to_text #.UT.expect
+      got←'Got'
+      gotterm←term_to_text returned
+      Z←align_and_join_message_parts hdr exp expterm got gotterm
+    ∇
+
+    ∇ Z←align_and_join_message_parts Parts;hdr;exp;expterm;got;gotterm;R1;C1;R2;C2;W
+      (hdr exp expterm got gotterm)←Parts
+      (R1 C1)←⍴expterm
+      (R2 C2)←⍴gotterm
+      W←⊃⊃⌈/C1 C2(⍴hdr)(⍴exp)(⍴got)
+      Z←(W↑hdr),[0.5](W↑exp)
+      Z←Z⍪(R1 W↑expterm)
+      Z←Z⍪(W↑got)
+      Z←Z⍪(R2 W↑gotterm)
+    ∇
+
+    ∇ Z←confparam in config
+      Z←1↓⊃({confparam≡⊃⍵}¨config)/config
+    ∇
+
+    ∇ Z←config has confparam
+      Z←∨/{confparam≡⊃⍵}¨config
+    ∇
+
+:EndNameSpace
--- a/samples/ATS/main.atxt
+++ b/samples/ATS/main.atxt
@@ -1,215 +0,0 @@
-%{
-#include "./../ATEXT/atextfun.hats"
-%}
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<title>EFFECTIVATS-DiningPhil2</title>
-#patscode_style()
-</head>
-
-<body>
-
-<h1>
-Effective ATS: Dining Philosophers
-</h1>
-
-In this article, I present an implementation of a slight variant of the
-famous problem of 5-Dining-Philosophers by Dijkstra that makes simple but
-convincing use of linear types.
-
-<h2>
-The Original Problem 
-</h2>
-
-There are five philosophers sitting around a table and there are also 5
-forks placed on the table such that each fork is located between the left
-hand of a philosopher and the right hand of another philosopher. Each
-philosopher does the following routine repeatedly: thinking and dining.  In
-order to dine, a philosopher needs to first acquire two forks: one located
-on his left-hand side and the other on his right-hand side. After
-finishing dining, a philosopher puts the two acquired forks onto the table:
-one on his left-hand side and the other on his right-hand side.
-
-<h2>
-A Variant of the Original Problem 
-</h2>
-
-The following twist is added to the original version:
-
-<p>
-
-After a fork is used, it becomes a "dirty" fork and needs to be put in a
-tray for dirty forks. There is a cleaner who cleans dirty forks and then
-puts them back on the table.
-
-<h2>
-Channels for Communication
-</h2>
-
-A channel is just a shared queue of fixed capacity. The following two
-functions are for inserting an element into and taking an element out of a
-given channel:
-
-<pre
-class="patsyntax">
-#pats2xhtml_sats("\
-fun{a:vt0p} channel_insert (channel (a), a): void
-fun{a:vt0p} channel_takeout (chan: channel (a)): (a) 
-")</pre>
-
-If [channel_insert] is called on a channel that is full, then the caller is
-blocked until an element is taken out of the channel.  If [channel_takeout]
-is called on a channel that is empty, then the caller is blocked until an
-element is inserted into the channel.
-
-<h2>
-A Channel for Each Fork
-</h2>
-
-Forks are resources given a linear type. Each fork is initially stored in a
-channel, which can be obtained by calling the following function:
-
-<pre
-class="patsyntax">
-#pats2xhtml_sats("\
-fun fork_changet (n: nphil): channel(fork)
-")</pre>
-
-where the type [nphil] is defined to be [natLt(5)] (for natural numbers
-less than 5). The channels for storing forks are chosen to be of capacity
-2. The reason that channels of capacity 2 are chosen to store at most one
-element (in each of them) is to guarantee that these channels can never be
-full (so that there is no attempt made to send signals to awake callers
-supposedly being blocked due to channels being full).
-
-
-<h2>
-A Channel for the Fork Tray
-</h2>
-
-A tray for storing "dirty" forks is also a channel, which can be obtained
-by calling the following function:
-
-<pre
-class="patsyntax">
-#pats2xhtml_sats("\
-fun forktray_changet ((*void*)): channel(fork)
-")</pre>
-
-The capacity chosen for the channel is 6 (instead of 5) so that it can
-never become full (as there are only 5 forks in total).
-
-<h2>
-Philosopher Loop
-</h2>
-
-Each philosopher is implemented as a loop:
-
-<pre
-class="patsyntax">
-#pats2xhtml_dats('\
-implement
-phil_loop (n) = let
-//
-val () = phil_think (n)
-//
-val nl = phil_left (n) // = n
-val nr = phil_right (n) // = (n+1) % 5
-//
-val ch_lfork = fork_changet (nl)
-val ch_rfork = fork_changet (nr)
-//
-val lf = channel_takeout (ch_lfork)
-val () = println! ("phil_loop(", n, ") picks left fork")
-//
-val () = randsleep (2) // sleep up to 2 seconds
-//
-val rf = channel_takeout (ch_rfork)
-val () = println! ("phil_loop(", n, ") picks right fork")
-//
-val () = phil_dine (n, lf, rf)
-//
-val ch_forktray = forktray_changet ()
-val () = channel_insert (ch_forktray, lf) // left fork to dirty tray
-val () = channel_insert (ch_forktray, rf) // right fork to dirty tray
-//
-in
-  phil_loop (n)
-end // end of [phil_loop]
-')</pre>
-
-It should be straighforward to follow the code for [phil_loop].
-
-<h2>
-Fork Cleaner Loop
-</h2>
-
-A cleaner is implemented as a loop:
-
-<pre
-class="patsyntax">
-#pats2xhtml_dats('\
-implement
-cleaner_loop () = let
-//
-val ch = forktray_changet ()
-val f0 = channel_takeout (ch) // [f0] is dirty
-//
-val () = cleaner_wash (f0) // washes dirty [f0]
-val () = cleaner_return (f0) // puts back cleaned [f0]
-//
-in
-  cleaner_loop ()
-end // end of [cleaner_loop]
-')</pre>
-
-The function [cleaner_return] first finds out the number of a given fork
-and then uses the number to locate the channel for storing the fork. Its
-actual implementation is given as follows:
-
-<pre
-class="patsyntax">
-#pats2xhtml_dats('\
-implement
-cleaner_return (f) =
-{
-  val n = fork_get_num (f)
-  val ch = fork_changet (n)
-  val () = channel_insert (ch, f)
-}
-')</pre>
-
-It should now be straighforward to follow the code for [cleaner_loop].
-
-<h2>
-Testing
-</h2>
-
-The entire code of this implementation is stored in the following files:
-
-<pre>
-DiningPhil2.sats
-DiningPhil2.dats
-DiningPhil2_fork.dats
-DiningPhil2_thread.dats
-</pre>
-
-There is also a Makefile available for compiling the ATS source code into
-an excutable for testing. One should be able to encounter a deadlock after
-running the simulation for a while.
-
-<hr size="2">
-
-This article is written by <a href="http://www.cs.bu.edu/~hwxi/">Hongwei Xi</a>.
-
-</body>
-</html>
-
-%{
-implement main () = fprint_filsub (stdout_ref, "main_atxt.txt")
-%}
--- a/System/filenames/ant.xml
+++ b/System/filenames/ant.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<project name="WebBuild">
+
+    <!-- generate timestamps -->
+    <tstamp />
+
+    <!-- Debugging Macro -->
+    <import file="echopath.xml" />
+
+    <!-- JS build files macro -->
+    <import file="rhinoscript.xml" />
+
+    <!-- Component Build Files -->
+    <import file="setup.xml" />
+    <import file="clean.xml" />
+    <import file="copy.xml" />
+    <import file="file.transform.xml" />
+    <import file="external.tools.xml" />
+    <import file="rename.xml" />
+    <import file="js.xml" />
+    <import file="css.xml" />
+    <import file="img.xml" />
+    <import file="png8.xml" />
+    <import file="yui.xml" />
+    <import file="cdn.xml" />
+    <import file="datauri.xml" />
+    <import file="devlive.xml" />
+
+    <!-- This dirname is the only complete path we know for sure, everything builds off of it -->
+    <dirname property="dir.build" file="${ant.file.WebBuild}" />
+
+    <!-- get name for newly built folder -->
+    <basename property="app.name"       file="${basedir}" />
+
+    <!-- read global properties file -->
+    <property file="${dir.build}\build.properties" />
+
+    <!-- Build Directories -->
+    <property name="dir.build.js"   location="${dir.build}/js" />
+
+    <!-- App Directories -->
+    <property name="dir.app"        location="${dir.result}/${app.name}" />
+    <property name="dir.app.temp"   location="${dir.temp}/${app.name}" />
+    <property name="dir.app.files"  location="${dir.app.temp}/${dir.files}" />
+
+    <!-- Files -->
+    <property name="mapping.js"     location="${dir.app.temp}/${mapping.file.js}" />
+    <property name="mapping.css"    location="${dir.app.temp}/${mapping.file.css}" />
+    <property name="mapping.img"    location="${dir.app.temp}/${mapping.file.img}" />
+    <property name="mapping.swf"    location="${dir.app.temp}/${mapping.file.swf}" />
+    <property name="mapping.fonts"  location="${dir.app.temp}/${mapping.file.fonts}" />
+
+    <!-- Tool Directories -->
+    <property name="dir.bin"    location="${dir.build}/Bin" />
+    <property name="dir.jar"    location="${dir.bin}/jar" />
+
+    <!-- Tool Files -->
+	<property name="tools.compressor"     location="${dir.jar}/${tools.file.compressor}" />
+	<property name="tools.cssembed"       location="${dir.jar}/${tools.file.cssembed}" />
+    <property name="tools.filetransform"  location="${dir.jar}/${tools.file.filetransform}" />
+    <property name="tools.optipng"        location="${dir.bin}/${tools.file.optipng}" />
+    <property name="tools.jpegtran"       location="${dir.bin}/${tools.file.jpegtran}" />
+
+
+    <!-- BUILD TARGETS -->
+
+    <!-- low level utility build targets -->
+
+    <!-- Build the tools -->
+    <target name="-setup.build.tools"
+            depends="-define.filetransform, -define.cssembed, -define.yuicompressor, -define.jsclasspath"
+    />
+
+    <!-- set up filesystem properties -->
+    <target
+        name="-setup"
+        depends="-setup.mode, -setup.conditions, -setup.js, -setup.css, -setup.swf, -setup.img, -setup.fonts, -setup.yui"
+    />
+
+    <!-- utility-ish targets -->
+    <target name="copy"         depends="clean, tools, -copy" />
+    <target name="tools"        depends="-setup.build.tools" />
+    <target name="finalize"     depends="copy, -finalize" />
+    <target name="-prepare"     depends="copy, -setup" />
+
+    <!-- individual component build targets (empty descriptions are to make sure they show in "ant -p") -->
+    <target name="devlive"      depends="-prepare, -devlive"            description="" />
+    <target name="js"           depends="-prepare, -js"                 description="" />
+    <target name="css"          depends="-prepare, -css"                description="" />
+    <target name="rename"       depends="-prepare, -rename"             description="" />
+    <target name="yui"          depends="-prepare, rename, -yui"        description="" />
+    <target name="cdn"          depends="-prepare, -cdn"                description="" />
+
+    <!-- high level build targets (Excluding of images is on purpose here, it's slow) -->
+    <target name="core"
+            depends="devlive, js, css, cdn, rename, yui, -js.inline"
+            description="Core build work"
+    />
+
+    <target name="prod"
+            depends="core, finalize"
+            description="Full Production Build"
+    />
+
+    <!-- debug target -->
+    <target name="debug" depends="-setup">
+        <echoproperties/>
+    </target>
+
+</project>
--- a/System/filenames/build.xml
+++ b/System/filenames/build.xml
@@ -0,0 +1 @@
+ant.xml
--- a/samples/ApacheConf/apache.vhost
+++ b/samples/ApacheConf/apache.vhost
@@ -0,0 +1,17 @@
+#######################
+# HOSTNAME
+######################
+
+<VirtualHost 127.0.0.1:PORT>
+    ServerAdmin patrick@heysparkbox.com
+    DocumentRoot "/var/www/HOSTNAME"
+    ServerName HOSTNAME
+
+    <Directory "/var/www/HOSTNAME">
+       Options Indexes MultiViews FollowSymLinks
+       AllowOverride All
+       Order allow,deny
+       Allow from all
+       DirectoryIndex index.php
+   </Directory>
+</VirtualHost>
--- a/samples/AsciiDoc/list.asc
+++ b/samples/AsciiDoc/list.asc
@@ -1,6 +1,9 @@
 AsciiDoc Home Page
 ==================

+Title
+-----
+
 Example Articles
 ~~~~~~~~~~~~~~~~
 - Item 1
--- a/samples/Assembly/External
+++ b/samples/Assembly/External
@@ -0,0 +1,66 @@
+	ORG	0000h
+	SJMP	START
+	ORG	0003h
+	LCALL	INT0_ISR
+	RETI
+	ORG	000Bh
+	LCALL	T0_ISR
+	RETI
+	ORG	0013h
+	LCALL	INT1_ISR
+	RETI
+	ORG	001Bh
+	LCALL	T1_ISR
+	RETI
+	ORG	0023h
+	LCALL	UART_ISR
+	RETI
+	ORG	0030h
+START:
+	MOV	A,#11111110b
+	SETB	IT0	; Set External Interrupt 0 to be falling edge triggered
+	SETB	EX0	; Enable External Interrut 0
+	SETB	EA	; Enable Interrupt
+LEFT:			
+	CJNE	A,#01111111b,LOOP1
+	JMP	RIGHT
+LOOP1:
+	MOV	P1,A
+	RL	A	
+	LCALL	DELAY
+	SJMP	LEFT	
+RIGHT:
+	CJNE	A,#11111110b,LOOP2
+	JMP	LEFT
+LOOP2:
+	MOV	P1,A
+	RR	A	
+	LCALL	DELAY
+	SJMP	RIGHT
+	
+INT0_ISR:
+	MOV	R1,#3
+FLASH:
+	MOV	P1,#00h
+	LCALL	DELAY
+	MOV	P1,#0FFh
+	LCALL	DELAY
+	DJNZ	R1,FLASH
+	RET
+T0_ISR:
+	RET
+INT1_ISR:
+	RET
+T1_ISR:
+	RET
+UART_ISR:
+	RET
+
+DELAY:	MOV	R5,#20	;R5*20 mS
+D1:     MOV	R6,#40
+D2:     MOV	R7,#249
+	DJNZ	R7,$
+ 	DJNZ	R6,D2
+  	DJNZ	R5,D1
+   	RET
+	END
--- a/samples/Assembly/FASM.asm
+++ b/samples/Assembly/FASM.asm
@@ -0,0 +1,350 @@
+
+; flat assembler interface for Win32
+; Copyright (c) 1999-2014, Tomasz Grysztar.
+; All rights reserved.
+
+	format	PE console
+
+section '.text' code readable executable
+
+start:
+
+	mov	[con_handle],STD_OUTPUT_HANDLE
+	mov	esi,_logo
+	call	display_string
+
+	call	get_params
+	jc	information
+
+	call	init_memory
+
+	mov	esi,_memory_prefix
+	call	display_string
+	mov	eax,[memory_end]
+	sub	eax,[memory_start]
+	add	eax,[additional_memory_end]
+	sub	eax,[additional_memory]
+	shr	eax,10
+	call	display_number
+	mov	esi,_memory_suffix
+	call	display_string
+
+	call	[GetTickCount]
+	mov	[start_time],eax
+
+	call	preprocessor
+	call	parser
+	call	assembler
+	call	formatter
+
+	call	display_user_messages
+	movzx	eax,[current_pass]
+	inc	eax
+	call	display_number
+	mov	esi,_passes_suffix
+	call	display_string
+	call	[GetTickCount]
+	sub	eax,[start_time]
+	xor	edx,edx
+	mov	ebx,100
+	div	ebx
+	or	eax,eax
+	jz	display_bytes_count
+	xor	edx,edx
+	mov	ebx,10
+	div	ebx
+	push	edx
+	call	display_number
+	mov	dl,'.'
+	call	display_character
+	pop	eax
+	call	display_number
+	mov	esi,_seconds_suffix
+	call	display_string
+      display_bytes_count:
+	mov	eax,[written_size]
+	call	display_number
+	mov	esi,_bytes_suffix
+	call	display_string
+	xor	al,al
+	jmp	exit_program
+
+information:
+	mov	esi,_usage
+	call	display_string
+	mov	al,1
+	jmp	exit_program
+
+get_params:
+	mov	[input_file],0
+	mov	[output_file],0
+	mov	[symbols_file],0
+	mov	[memory_setting],0
+	mov	[passes_limit],100
+	call	[GetCommandLine]
+	mov	esi,eax
+	mov	edi,params
+    find_command_start:
+	lodsb
+	cmp	al,20h
+	je	find_command_start
+	cmp	al,22h
+	je	skip_quoted_name
+    skip_name:
+	lodsb
+	cmp	al,20h
+	je	find_param
+	or	al,al
+	jz	all_params
+	jmp	skip_name
+    skip_quoted_name:
+	lodsb
+	cmp	al,22h
+	je	find_param
+	or	al,al
+	jz	all_params
+	jmp	skip_quoted_name
+    find_param:
+	lodsb
+	cmp	al,20h
+	je	find_param
+	cmp	al,'-'
+	je	option_param
+	cmp	al,0Dh
+	je	all_params
+	or	al,al
+	jz	all_params
+	cmp	[input_file],0
+	jne	get_output_file
+	mov	[input_file],edi
+	jmp	process_param
+      get_output_file:
+	cmp	[output_file],0
+	jne	bad_params
+	mov	[output_file],edi
+    process_param:
+	cmp	al,22h
+	je	string_param
+    copy_param:
+	stosb
+	lodsb
+	cmp	al,20h
+	je	param_end
+	cmp	al,0Dh
+	je	param_end
+	or	al,al
+	jz	param_end
+	jmp	copy_param
+    string_param:
+	lodsb
+	cmp	al,22h
+	je	string_param_end
+	cmp	al,0Dh
+	je	param_end
+	or	al,al
+	jz	param_end
+	stosb
+	jmp	string_param
+    option_param:
+	lodsb
+	cmp	al,'m'
+	je	memory_option
+	cmp	al,'M'
+	je	memory_option
+	cmp	al,'p'
+	je	passes_option
+	cmp	al,'P'
+	je	passes_option
+	cmp	al,'s'
+	je	symbols_option
+	cmp	al,'S'
+	je	symbols_option
+    bad_params:
+	stc
+	ret
+    get_option_value:
+	xor	eax,eax
+	mov	edx,eax
+    get_option_digit:
+	lodsb
+	cmp	al,20h
+	je	option_value_ok
+	cmp	al,0Dh
+	je	option_value_ok
+	or	al,al
+	jz	option_value_ok
+	sub	al,30h
+	jc	invalid_option_value
+	cmp	al,9
+	ja	invalid_option_value
+	imul	edx,10
+	jo	invalid_option_value
+	add	edx,eax
+	jc	invalid_option_value
+	jmp	get_option_digit
+    option_value_ok:
+	dec	esi
+	clc
+	ret
+    invalid_option_value:
+	stc
+	ret
+    memory_option:
+	lodsb
+	cmp	al,20h
+	je	memory_option
+	cmp	al,0Dh
+	je	bad_params
+	or	al,al
+	jz	bad_params
+	dec	esi
+	call	get_option_value
+	or	edx,edx
+	jz	bad_params
+	cmp	edx,1 shl (32-10)
+	jae	bad_params
+	mov	[memory_setting],edx
+	jmp	find_param
+    passes_option:
+	lodsb
+	cmp	al,20h
+	je	passes_option
+	cmp	al,0Dh
+	je	bad_params
+	or	al,al
+	jz	bad_params
+	dec	esi
+	call	get_option_value
+	or	edx,edx
+	jz	bad_params
+	cmp	edx,10000h
+	ja	bad_params
+	mov	[passes_limit],dx
+	jmp	find_param
+    symbols_option:
+	mov	[symbols_file],edi
+      find_symbols_file_name:
+	lodsb
+	cmp	al,20h
+	jne	process_param
+	jmp	find_symbols_file_name
+    param_end:
+	dec	esi
+    string_param_end:
+	xor	al,al
+	stosb
+	jmp	find_param
+    all_params:
+	cmp	[input_file],0
+	je	bad_params
+	clc
+	ret
+
+include 'system.inc'
+
+include '..\errors.inc'
+include '..\symbdump.inc'
+include '..\preproce.inc'
+include '..\parser.inc'
+include '..\exprpars.inc'
+include '..\assemble.inc'
+include '..\exprcalc.inc'
+include '..\formats.inc'
+include '..\x86_64.inc'
+include '..\avx.inc'
+
+include '..\tables.inc'
+include '..\messages.inc'
+
+section '.data' data readable writeable
+
+include '..\version.inc'
+
+_copyright db 'Copyright (c) 1999-2014, Tomasz Grysztar',0Dh,0Ah,0
+
+_logo db 'flat assembler  version ',VERSION_STRING,0
+_usage db 0Dh,0Ah
+       db 'usage: fasm <source> [output]',0Dh,0Ah
+       db 'optional settings:',0Dh,0Ah
+       db ' -m <limit>    set the limit in kilobytes for the available memory',0Dh,0Ah
+       db ' -p <limit>    set the maximum allowed number of passes',0Dh,0Ah
+       db ' -s <file>     dump symbolic information for debugging',0Dh,0Ah
+       db 0
+_memory_prefix db '  (',0
+_memory_suffix db ' kilobytes memory)',0Dh,0Ah,0
+_passes_suffix db ' passes, ',0
+_seconds_suffix db ' seconds, ',0
+_bytes_suffix db ' bytes.',0Dh,0Ah,0
+
+align 4
+
+include '..\variable.inc'
+
+con_handle dd ?
+memory_setting dd ?
+start_time dd ?
+bytes_count dd ?
+displayed_count dd ?
+character db ?
+last_displayed rb 2
+
+params rb 1000h
+options rb 1000h
+buffer rb 4000h
+
+stack 10000h
+
+section '.idata' import data readable writeable
+
+  dd 0,0,0,rva kernel_name,rva kernel_table
+  dd 0,0,0,0,0
+
+  kernel_table:
+    ExitProcess dd rva _ExitProcess
+    CreateFile dd rva _CreateFileA
+    ReadFile dd rva _ReadFile
+    WriteFile dd rva _WriteFile
+    CloseHandle dd rva _CloseHandle
+    SetFilePointer dd rva _SetFilePointer
+    GetCommandLine dd rva _GetCommandLineA
+    GetEnvironmentVariable dd rva _GetEnvironmentVariable
+    GetStdHandle dd rva _GetStdHandle
+    VirtualAlloc dd rva _VirtualAlloc
+    VirtualFree dd rva _VirtualFree
+    GetTickCount dd rva _GetTickCount
+    GetSystemTime dd rva _GetSystemTime
+    GlobalMemoryStatus dd rva _GlobalMemoryStatus
+    dd 0
+
+  kernel_name db 'KERNEL32.DLL',0
+
+  _ExitProcess dw 0
+    db 'ExitProcess',0
+  _CreateFileA dw 0
+    db 'CreateFileA',0
+  _ReadFile dw 0
+    db 'ReadFile',0
+  _WriteFile dw 0
+    db 'WriteFile',0
+  _CloseHandle dw 0
+    db 'CloseHandle',0
+  _SetFilePointer dw 0
+    db 'SetFilePointer',0
+  _GetCommandLineA dw 0
+    db 'GetCommandLineA',0
+  _GetEnvironmentVariable dw 0
+    db 'GetEnvironmentVariableA',0
+  _GetStdHandle dw 0
+    db 'GetStdHandle',0
+  _VirtualAlloc dw 0
+    db 'VirtualAlloc',0
+  _VirtualFree dw 0
+    db 'VirtualFree',0
+  _GetTickCount dw 0
+    db 'GetTickCount',0
+  _GetSystemTime dw 0
+    db 'GetSystemTime',0
+  _GlobalMemoryStatus dw 0
+    db 'GlobalMemoryStatus',0
+
+section '.reloc' fixups data readable discardable
--- a/samples/Assembly/forth.nasm
+++ b/samples/Assembly/forth.nasm
--- a/samples/Assembly/fp_sqr32_160_comba.inc
+++ b/samples/Assembly/fp_sqr32_160_comba.inc
@@ -0,0 +1,245 @@
+
+    push r2
+    dint
+    nop
+    bis #MPYDLYWRTEN,&MPY32CTL0
+    bic #MPYDLY32,&MPY32CTL0
+    mov #SUMEXT,r13
+    clr r12
+
+    mov @r15+,r4
+    mov @r15+,r5
+
+    mov @r15+,r6
+    mov @r15+,r7
+
+    mov @r15+,r8
+    mov @r15+,r9
+
+    mov @r15+,r10
+    mov @r15+,r11
+
+    sub #2*8,r15
+
+    /* SELF_STEP_FIRST */
+    mov r4,&MPY32L
+    mov r5,&MPY32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*0(r14)
+    mov &RES1,2*(0+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r6,&OP2L
+    mov r7,&OP2H
+    add &SUMEXT,r12
+    mov r6,&OP2L
+    mov r7,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*2(r14)
+    add @r13,r12
+    mov &RES1,2*(2+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r8,&OP2L
+    mov r9,&OP2H
+    add &SUMEXT,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* SELF_STEP */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r6,&OP2L
+    mov r7,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*4(r14)
+    add @r13,r12
+    mov &RES1,2*(4+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* STEP_2MORE */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+    add &SUMEXT,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*6(r14)
+    add @r13,r12
+    mov &RES1,2*(6+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov 2*8(r15),&OP2L
+    mov 2*9(r15),&OP2H
+    add &SUMEXT,r12
+    mov 2*8(r15),&OP2L
+    mov 2*9(r15),&OP2H
+
+    /* STEP_2MORE */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* SELF_STEP */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    add @r13,r12
+    mov r8,&OP2L
+    mov r9,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*8(r14)
+    add @r13,r12
+    mov &RES1,2*(8+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    mov 2*8(r15),r4
+    mov 2*(8+1)(r15),r5
+
+    /* STEP_1 */
+    mov r6,&MAC32L
+    mov r7,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* STEP_2MORE */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+    add &SUMEXT,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*10(r14)
+    add @r13,r12
+    mov &RES1,2*(10+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r8,&MAC32L
+    mov r9,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* SELF_STEP */
+    mov r10,&MAC32L
+    mov r11,&MAC32H
+    add @r13,r12
+    mov r10,&OP2L
+    mov r11,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*12(r14)
+    add @r13,r12
+    mov &RES1,2*(12+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* STEP_1 */
+    mov r10,&MAC32L
+    mov r11,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+    add &SUMEXT,r12
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*14(r14)
+    add @r13,r12
+    mov &RES1,2*(14+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* SELF_STEP_1 */
+    mov r4,&MAC32L
+    mov r5,&MAC32H
+    mov r4,&OP2L
+    mov r5,&OP2H
+
+    /* COLUMN_END */
+    mov &RES0,2*16(r14)
+    add @r13,r12
+    mov &RES1,2*(16+1)(r14)
+    mov &RES2,&RES0
+    mov &RES3,&RES1
+    mov r12,&RES2
+    clr &RES3
+    clr r12
+
+    /* END */
+    mov &RES0,2*18(r14)
+    mov &RES1,2*(18+1)(r14)
+    pop r2
+    eint
--- a/samples/Assembly/lib.inc
+++ b/samples/Assembly/lib.inc
@@ -0,0 +1,170 @@
+
+; ------------------------------------------------------------------------
+; 显示 AL 中的数字
+; ------------------------------------------------------------------------
+DispAL:
+	push	ecx
+	push	edx
+	push	edi
+
+	mov	edi, [dwDispPos]
+
+	mov	ah, 0Fh			; 0000b: 黑底    1111b: 白字
+	mov	dl, al
+	shr	al, 4
+	mov	ecx, 2
+.begin:
+	and	al, 01111b
+	cmp	al, 9
+	ja	.1
+	add	al, '0'
+	jmp	.2
+.1:
+	sub	al, 0Ah
+	add	al, 'A'
+.2:
+	mov	[gs:edi], ax
+	add	edi, 2
+
+	mov	al, dl
+	loop	.begin
+	;add	edi, 2
+
+	mov	[dwDispPos], edi
+
+	pop	edi
+	pop	edx
+	pop	ecx
+
+	ret
+; DispAL 结束-------------------------------------------------------------
+
+
+; ------------------------------------------------------------------------
+; 显示一个整形数
+; ------------------------------------------------------------------------
+DispInt:
+	mov	eax, [esp + 4]
+	shr	eax, 24
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	shr	eax, 16
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	shr	eax, 8
+	call	DispAL
+
+	mov	eax, [esp + 4]
+	call	DispAL
+
+	mov	ah, 07h			; 0000b: 黑底    0111b: 灰字
+	mov	al, 'h'
+	push	edi
+	mov	edi, [dwDispPos]
+	mov	[gs:edi], ax
+	add	edi, 4
+	mov	[dwDispPos], edi
+	pop	edi
+
+	ret
+; DispInt 结束------------------------------------------------------------
+
+; ------------------------------------------------------------------------
+; 显示一个字符串
+; ------------------------------------------------------------------------
+DispStr:
+	push	ebp
+	mov	ebp, esp
+	push	ebx
+	push	esi
+	push	edi
+
+	mov	esi, [ebp + 8]	; pszInfo
+	mov	edi, [dwDispPos]
+	mov	ah, 0Fh
+.1:
+	lodsb
+	test	al, al
+	jz	.2
+	cmp	al, 0Ah	; 是回车吗?
+	jnz	.3
+	push	eax
+	mov	eax, edi
+	mov	bl, 160
+	div	bl
+	and	eax, 0FFh
+	inc	eax
+	mov	bl, 160
+	mul	bl
+	mov	edi, eax
+	pop	eax
+	jmp	.1
+.3:
+	mov	[gs:edi], ax
+	add	edi, 2
+	jmp	.1
+
+.2:
+	mov	[dwDispPos], edi
+
+	pop	edi
+	pop	esi
+	pop	ebx
+	pop	ebp
+	ret
+; DispStr 结束------------------------------------------------------------
+
+; ------------------------------------------------------------------------
+; 换行
+; ------------------------------------------------------------------------
+DispReturn:
+	push	szReturn
+	call	DispStr			;printf("\n");
+	add	esp, 4
+
+	ret
+; DispReturn 结束---------------------------------------------------------
+
+
+; ------------------------------------------------------------------------
+; 内存拷贝，仿 memcpy
+; ------------------------------------------------------------------------
+; void* MemCpy(void* es:pDest, void* ds:pSrc, int iSize);
+; ------------------------------------------------------------------------
+MemCpy:
+	push	ebp
+	mov	ebp, esp
+
+	push	esi
+	push	edi
+	push	ecx
+
+	mov	edi, [ebp + 8]	; Destination
+	mov	esi, [ebp + 12]	; Source
+	mov	ecx, [ebp + 16]	; Counter
+.1:
+	cmp	ecx, 0		; 判断计数器
+	jz	.2		; 计数器为零时跳出
+
+	mov	al, [ds:esi]		; ┓
+	inc	esi			; ┃
+					; ┣ 逐字节移动
+	mov	byte [es:edi], al	; ┃
+	inc	edi			; ┛
+
+	dec	ecx		; 计数器减一
+	jmp	.1		; 循环
+.2:
+	mov	eax, [ebp + 8]	; 返回值
+
+	pop	ecx
+	pop	edi
+	pop	esi
+	mov	esp, ebp
+	pop	ebp
+
+	ret			; 函数结束，返回
+; MemCpy 结束-------------------------------------------------------------
+
--- a/samples/Assembly/macros.inc
+++ b/samples/Assembly/macros.inc
@@ -0,0 +1,321 @@
+BLARGG_MACROS_INCLUDED = 1
+
+; Allows extra error checking with modified version
+; of ca65. Otherwise acts like a constant of 0.
+ADDR = 0
+
+; Switches to Segment and places Line there.
+; Line can be an .align directive, .res, .byte, etc.
+; Examples:
+; seg_data BSS, .align 256
+; seg_data RODATA, {message: .byte "Test",0}
+.macro seg_data Segment, Line
+	.pushseg
+	.segment .string(Segment)
+		Line
+	.popseg
+.endmacro
+
+; Reserves Size bytes in Segment for Name.
+; If Size is omitted, reserves one byte.
+.macro seg_res Segment, Name, Size
+	.ifblank Size
+		seg_data Segment, Name: .res 1
+	.else
+		seg_data Segment, Name: .res Size
+	.endif
+.endmacro
+
+; Shortcuts for zeropage, bss, and stack
+.define zp_res  seg_res ZEROPAGE,
+.define nv_res  seg_res NVRAM,
+.define bss_res seg_res BSS,
+.define sp_res  seg_res STACK,
+.define zp_byte zp_res
+
+; Copies byte from Src to Addr. If Src begins with #,
+; it sets Addr to the immediate value.
+; Out: A = byte copied
+; Preserved: X, Y
+.macro mov Addr, Src
+	lda Src
+	sta Addr
+.endmacro
+
+; Copies word from Src to Addr. If Src begins with #,
+; it sets Addr the immediate value.
+; Out: A = high byte of word
+; Preserved: X, Y
+.macro movw Addr, Src
+	.if .match( .left( 1, {Src} ), # )
+		lda #<(.right( .tcount( {Src} )-1, {Src} ))
+		sta Addr
+		lda #>(.right( .tcount( {Src} )-1, {Src} ))
+		sta 1+(Addr)
+	.else
+		lda Src
+		sta Addr
+		lda 1+(Src)
+		sta 1+(Addr)
+	.endif
+.endmacro
+
+; Increments 16-bit value at Addr.
+; Out: EQ/NE based on resulting 16-bit value
+; Preserved: A, X, Y
+.macro incw Addr
+	.local @Skip
+	inc Addr
+	bne @Skip
+	inc 1+(Addr)
+@Skip:
+.endmacro
+
+; Adds Src to word at Addr.
+; Out: A = high byte of result, carry set appropriately
+; Preserved: X, Y
+.macro addw Addr, Src
+	.if .match( .left( 1, {Src} ), # )
+		addw_ Addr,(.right( .tcount( {Src} )-1, {Src} ))
+	.else
+		lda Addr
+		clc
+		adc Src
+		sta Addr
+		
+		lda 1+(Addr)
+		adc 1+(Src)
+		sta 1+(Addr)
+	.endif
+.endmacro
+.macro addw_ Addr, Imm
+	lda Addr
+	clc
+	adc #<Imm
+	sta Addr
+	
+	;.if (Imm >> 8) <> 0
+		lda 1+(Addr)
+		adc #>Imm
+		sta 1+(Addr)
+	;.else
+	;   .local @Skip
+	;   bcc @Skip
+	;   inc 1+(Addr)
+	;@Skip:
+	;.endif
+.endmacro
+
+; Splits list of words into tables of low and high bytes
+; Example: split_words foo, {$1234, $5678}
+; expands to:
+; foo_l: $34, $78
+; foo_h: $12, $56
+; foo_count = 2
+.macro split_words Label, Words
+	.ident (.concat (.string(Label), "_l")): .lobytes Words
+	.ident (.concat (.string(Label), "_h")): .hibytes Words
+	.ident (.concat (.string(Label), "_count")) = * - .ident (.concat (.string(Label), "_h"))
+.endmacro
+
+.macro SELECT Bool, True, False, Extra
+	.ifndef Bool
+		False Extra
+	.elseif Bool <> 0
+		True Extra
+	.else
+		False Extra
+	.endif
+.endmacro
+
+.macro DEFAULT Name, Value
+	.ifndef Name
+		Name = Value
+	.endif
+.endmacro
+
+.ifp02
+	; 6502 doesn't define these alternate names
+	.define blt bcc
+	.define bge bcs
+.endif
+.define jlt jcc
+.define jge jcs
+
+; Jxx Target = Bxx Target, except it can go farther than
+; 128 bytes. Implemented via branch around a JMP.
+
+; Don't use ca65's longbranch, because they fail for @labels
+;.macpack longbranch
+
+.macro jeq Target
+	bne *+5
+	jmp Target
+.endmacro
+
+.macro jne Target
+	beq *+5
+	jmp Target
+.endmacro
+
+.macro jmi Target
+	bpl *+5
+	jmp Target
+.endmacro
+
+.macro jpl Target
+	bmi *+5
+	jmp Target
+.endmacro
+
+.macro jcs Target
+	bcc *+5
+	jmp Target
+.endmacro
+
+.macro jcc Target
+	bcs *+5
+	jmp Target
+.endmacro
+
+.macro jvs Target
+	bvc *+5
+	jmp Target
+.endmacro
+
+.macro jvc Target
+	bvs *+5
+	jmp Target
+.endmacro
+
+
+; Passes constant data to routine in addr
+; Preserved: A, X, Y
+.macro jsr_with_addr routine,data
+	.local Addr
+	pha
+	lda #<Addr
+	sta addr
+	lda #>Addr
+	sta addr+1
+	pla
+	jsr routine
+	seg_data RODATA,{Addr: data}
+.endmacro
+
+; Calls routine multiple times, with A having the
+; value 'start' the first time, 'start+step' the
+; second time, up to 'end' for the last time.
+.macro for_loop routine,start,end,step
+	.local @for_loop
+	lda #start
+@for_loop:
+	pha
+	jsr routine
+	pla
+	clc
+	adc #step
+	cmp #<((end)+(step))
+	bne @for_loop
+.endmacro
+
+; Calls routine n times. The value of A in the routine
+; counts from 0 to n-1.
+.macro loop_n_times routine,n
+	for_loop routine,0,n-1,+1
+.endmacro
+
+; Same as for_loop, except uses 16-bit value in YX.
+; -256 <= step <= 255
+.macro for_loop16 routine,start,end,step
+.if (step) < -256 || (step) > 255
+	.error "Step must be within -256 to 255"
+.endif
+	.local @for_loop_skip
+	.local @for_loop
+	ldy #>(start)
+	lda #<(start)
+@for_loop:
+	tax
+	pha
+	tya
+	pha
+	jsr routine
+	pla
+	tay
+	pla
+	clc
+	adc #step
+.if (step) > 0
+	bcc @for_loop_skip
+	iny
+.else
+	bcs @for_loop_skip
+	dey
+.endif
+@for_loop_skip:
+	cmp #<((end)+(step))
+	bne @for_loop
+	cpy #>((end)+(step))
+	bne @for_loop
+.endmacro
+
+; Stores byte at addr
+; Preserved: X, Y
+.macro setb addr, byte
+	lda #byte
+	sta addr
+.endmacro
+
+; Stores word at addr
+; Preserved: X, Y
+.macro setw addr, word
+	lda #<(word)
+	sta addr
+	lda #>(word)
+	sta addr+1
+.endmacro
+
+; Loads XY with 16-bit immediate or value at address
+.macro ldxy Arg
+	.if .match( .left( 1, {Arg} ), # )
+		ldy #<(.right( .tcount( {Arg} )-1, {Arg} ))
+		ldx #>(.right( .tcount( {Arg} )-1, {Arg} ))
+	.else
+		ldy (Arg)
+		ldx (Arg)+1
+	.endif
+.endmacro
+
+; Increments XY as 16-bit register, in CONSTANT time.
+; Z flag set based on entire result.
+; Preserved: A
+; Time: 7 clocks
+.macro inxy
+	iny ; 2
+	beq *+4 ; 3
+		; -1
+	bne *+3 ; 3
+		; -1
+	inx ; 2
+.endmacro
+
+; Negates A and adds it to operand
+.macro subaf Operand
+	eor #$FF
+	sec
+	adc Operand
+.endmacro
+
+; Initializes CPU registers to reasonable values
+; Preserved: A, Y
+.macro init_cpu_regs
+	sei
+	cld     ; unnecessary on NES, but might help on clone
+	ldx #$FF
+	txs
+	.ifndef BUILD_NSF
+		inx
+		stx PPUCTRL
+	.endif
+.endmacro
--- a/samples/BitBake/gstreamer-libav.bb
+++ b/samples/BitBake/gstreamer-libav.bb
@@ -0,0 +1,25 @@
+include gstreamer1.0-libav.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
+                    file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
+                    file://gst-libs/ext/libav/LICENSE;md5=23a54f59b82572c203a559346e89ed57 \
+                    file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
+                    file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
+
+SRC_URI = " \
+    http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz \
+    file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
+    "
+SRC_URI[md5sum] = "86540dee14d31daf976eb2713f2294f3"
+SRC_URI[sha256sum] = "585eb7971006100ad771a852e07bd2f3e23bcc6eb0b1253a40b5a0e40e4e7418"
+
+LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
+  --cc='${CC}' --as='${CC}' --ld='${CC}' --nm='${NM}' --ar='${AR}' \
+  --ranlib='${RANLIB}' \
+  ${GSTREAMER_1_0_DEBUG}"
+
+S = "${WORKDIR}/gst-libav-${PV}"
+
--- a/samples/BitBake/qtbase-native.bb
+++ b/samples/BitBake/qtbase-native.bb
@@ -0,0 +1,13 @@
+require qt5-git.inc
+require ${PN}.inc
+
+do_install_append() {
+    # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
+    # e.g. qt3d, qtwayland
+    ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
+}
+
+QT_MODULE_BRANCH = "release"
+# v5.2.1 + 168 commits
+SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"
+
--- a/samples/BlitzMax/sample.bmx
+++ b/samples/BlitzMax/sample.bmx
@@ -0,0 +1,25 @@
+SuperStrict
+
+Framework Brl.StandardIO
+
+Type TMyType
+	Field property:int
+
+	Function A:int(param:int)
+		'do nothing
+	End Function
+
+	Method B:int(param:int)
+		'do nothing
+	End Method
+End Type
+
+
+Global my:TMyType = new TMyType
+?Win32
+	my.A()
+	my.B()
+?Linux
+	my.B()
+	my.A()
+?
--- a/samples/Brainfuck/factor.b
+++ b/samples/Brainfuck/factor.b
@@ -0,0 +1,195 @@
+* factor an arbitrarily large positive integer
+*
+* Copyright (C) 1999 by Brian Raiter
+* under the GNU General Public License
+
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>-
+
+*
+* read in the number
+*
+
+<<<<<<<<<+
+[-[>>>>>>>>>>][-]<<<<<<<<<<[[->>>>>>>>>>+<<<<<<<<<<]<<<<<<<<<<]
+  >>>>>>>>>>,----------]
+>>>>>>>>>>[------------------------------------->>>>>>>>>->]
+<[+>[>>>>>>>>>+>]<-<<<<<<<<<<]-
+
+*
+* display the number and initialize the loop variable to two
+*
+
+[>++++++++++++++++++++++++++++++++++++++++++++++++.
+  ------------------------------------------------<<<<<<<<<<<]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++.
+--------------------------.[-]
+>>>>>>>>>>>>++<<<<+
+
+*
+* the main loop
+*
+
+[ [-]>>
+
+  *
+  * make copies of the number and the loop variable
+  *
+
+  [>>>>[-]>[-]>[-]>[-]
+    >[-]>[-]
+    <<<<<<<[->>>+>+<<<<]>>>>>>>>]
+  <<<<<<<<<<[>>>>>>[-<<<<+>>>>]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+  [>[->>>+>>+<<<<<]>>>>>>>>>]
+  <<<<<<<<<<[>>>>>>[-<<<<<+>>>>>]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+
+  *
+  * divide the number by the loop variable
+  *
+
+  [>>>[-]>>>[-]>[-]>>>]                                  initialize
+  <<<<<<<<<<[<<<<<<<<<<]
+  >>>>>>>>>[-]>>>>>>>+<<<<<<<<[+]+
+  [ ->>                               double divisor until above dividend
+    [>>>>>>[->++<]>>>>]<<<<<<<<<<
+    [>>>>>>>>[-]>[-]
+       <<<<[->>>++<<<]<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<
+            [->--------->>>>>>>>>+<<<<<<<<<<[->+<]]]]]]]]]]]>>]
+    <<<<<<<<<<[>>>>>>>>>[-<+<<<+>>>>]<<<<<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>[-<+>
+            [-<--------->>>>>>>>>>>+<<<<<<<<<<[-<+>]]]]]]]]]]]>>>]
+    <<<<<<<<<<
+    [>>>>[->>>+>>+<<<<<]<<<<<<<<<<<<<<]
+    >>>>>>>>>>[>>>>>>>[-<<<+>>>]>>>]<<<<<<<<<<
+    [>>>>>>>>[->-<]>
+      [<<<<<<<<<[<[-]>>>>>>>>>>[-<<<<<<<<<<+>>>>>>>>>>]<<<<<<<<<<<<<<<<<<<]
+        >>>>>>>>>>>>>>>>>>>]
+      <<<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>[+[+[+[+[+[+[+[+[+[+[[-]<+>]]]]]]]]]]]<
+  ]
+  >>>>>>>>
+  [                                   subtract divisor from dividend
+    <<<<<<
+    [>>>>>>>>[-]>[-]<<<<<[->>>+>+<<<<]>>>>>>]<<<<<<<<<<
+    [>>>>>>>>[-<<<<+>>>>]<<<[->>>+>+<<<<]<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>>[-<<<<+>>>>]>]<<<<<<<<<<
+    [>>>>>>>>[-<->]<<<<<<<<<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<[->+<
+            [++++++++++[+>-<]>>>>>>>>>>-<<<<<<<<<<]]]]]]]]]]]>>>]
+    >>>>>>>+
+    [                                 if difference is nonnegative then
+      [-]<<<<<<<<<<<<<<<<<            replace dividend and increment quotient
+      [>>>>[-]>>>>[-<<<<+>>>>]<<[->>+<<]<<<<<<<<<<<<<<<<]>>>>>>>>>>
+      [>>>>>>>>[->+<<<+>>]>>]<<<<<<<<<<
+      [>>>[->>>>>>+<<<<<<]<<<<<<<<<<<<<]>>>>>>>>>>
+      [>>>>>>>>>[-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<+>>>>>>
+                [-<<<<<<+>>>>>>[-<<<<<<--------->>>>>>>>>>>>>>>>+<<<<<<<<<<
+                [-<<<<<<+>>>>>>]]]]]]]]]]]>]
+      >>>>>>>
+    ]                                 halve divisor and loop until zero
+    <<<<<<<<<<<<<<<<<[<<<<<<<<<<]>>>>>>>>>>
+    [>>>>>>>>[-]<<[->+<]<[->>>+<<<]>>>>>]<<<<<<<<<<
+    [+>>>>>>>[-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>[-<<<<<<<->>>>>>+>
+             [-<<<<<<<+>>>>>>>]]]]]]]]]<<<<<<<
+             [->>>>>>>+<<<<<<<]-<<<<<<<<<<]
+    >>>>>>>
+    [-<<<<<<<<<<<+>>>>>>>>>>>]
+      >>>[>>>>>>>[-<<<<<<<<<<<+++++>>>>>>>>>>>]>>>]<<<<<<<<<<
+    [+>>>>>>>>[-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>[-<<<<<<<<->>>>>+>>>
+              [-<<<<<<<<+>>>>>>>>]]]]]]]]]<<<<<<<<
+              [->>>>>>>>+<<<<<<<<]-<<<<<<<<<<]
+    >>>>>>>>[-<<<<<<<<<<<<<+>>>>>>>>>>>>>]>>
+    [>>>>>>>>[-<<<<<<<<<<<<<+++++>>>>>>>>>>>>>]>>]<<<<<<<<<<
+    [<<<<<<<<<<]>>>>>>>>>>
+    >>>>>>
+  ]
+  <<<<<<
+
+  *
+  * make copies of the loop variable and the quotient
+  *
+
+  [>>>[->>>>+>+<<<<<]>>>>>>>]
+  <<<<<<<<<<
+  [>>>>>>>[-<<<<+>>>>]<<<<<[->>>>>+>>+<<<<<<<]<<<<<<<<<<<<]
+  >>>>>>>>>>[>>>>>>>[-<<<<<+>>>>>]>>>]<<<<<<<<<<
+
+  *
+  * break out of the loop if the quotient is larger than the loop variable
+  *
+
+  [>>>>>>>>>[-<->]<
+    [<<<<<<<<
+      [<<[-]>>>>>>>>>>[-<<<<<<<<<<+>>>>>>>>>>]<<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>>>>>>>>>>]<<<<<<<<<<<<<<<<<<]
+  >>>>>>>>[>-<[+[+[+[+[+[+[+[+[+[[-]>+<]]]]]]]]]]]>+
+
+  [ [-]
+
+    *
+    * partially increment the loop variable
+    *
+
+    <[-]+>>>>+>>>>>>>>[>>>>>>>>>>]<<<<<<<<<<
+
+    *
+    * examine the remainder for nonzero digits
+    *
+
+    [<<<<<<[<<<<[<<<<<<<<<<]>>>>+<<<<<<<<<<]<<<<]
+    >>>>>>>>>>>>>>>>>>>>[>>>>>>>>>>]<<<<<<<<<<[<<<<<<<<<<]
+    >>>>-
+
+    [ [+]
+
+      *
+      * decrement the loop variable and replace the number with the quotient
+      *
+
+      >>>>>>>>-<<[>[-]>>[-<<+>>]>>>>>>>]<<<<<<<<<<
+
+      *
+      * display the loop variable
+      *
+
+      [+>>[>>>>>>>>+>>]<<-<<<<<<<<<<]-
+      [>>++++++++++++++++++++++++++++++++++++++++++++++++.
+         ------------------------------------------------<<<<<<<<<<<<]
+      ++++++++++++++++++++++++++++++++.[-]>>>>
+
+    ]
+
+    *
+    * normalize the loop variable
+    *
+
+    >>>>>>
+    [>>[->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>+<<<<<
+       [->>>>>+<<<<<[->>>>>--------->>>>>+<<<<<<<<<<
+       [->>>>>+<<<<<]]]]]]]]]]]>>>>>>>>]
+    <<<<<<<<<<[>>>>>>>[-<<<<<+>>>>>]<<<<<<<<<<<<<<<<<]
+    >>>>>>>>>
+
+  ]<
+
+]>>
+
+*
+* display the number and end
+*
+
+[>>>>>>>>>>]<<<<<<<<<<[+>[>>>>>>>>>+>]<-<<<<<<<<<<]-
+[>++++++++++++++++++++++++++++++++++++++++++++++++.<<<<<<<<<<<]
++++++++++.
--- a/samples/Brainfuck/fib100.bf
+++ b/samples/Brainfuck/fib100.bf
@@ -0,0 +1,13 @@
+# Calculate and output all fibonacci numbers under 100
+
+++++++++++
+>+>>>>++++++++++++++++++++++++++++++++++++++++++++
+>++++++++++++++++++++++++++++++++<<<<<<[>[>>>>>>+>
+<<<<<<<-]>>>>>>>[<<<<<<<+>>>>>>>-]<[>++++++++++[-
+<-[>>+>+<<<-]>>>[<<<+>>>-]+<[>[-]<[-]]>[<<[>>>+<<<
+-]>>[-]]<<]>>>[>>+>+<<<-]>>>[<<<+>>>-]+<[>[-]<[-]]
+>[<<+>>[-]]<<<<<<<]>>>>>[+++++++++++++++++++++++++
+++++++++++++++++++++++.[-]]++++++++++<[->-<]>++++
++++++++++++++++++++++++++++++++++++++++++++.[-]<<
+<<<<<<<<<<[>>>+>+<<<<-]>>>>[<<<<+>>>>-]<-[>>.>.<<<
+[-]]<<[>>+>+<<<-]>>>[<<<+>>>-]<<[<+>-]>[<+>-]<<<-]
--- a/samples/Brainfuck/hello.bf
+++ b/samples/Brainfuck/hello.bf
@@ -0,0 +1,4 @@
+// More complex version of hello world
+
+>++++++++[<+++++++++>-]<.>>+>+>++>[-]+<[>[->+<<++++>]<<]>.+++++++..+++.>
+>+++++++.<<<[[-]<[-]>]<+++++++++++++++.>>.+++.------.--------.>>+.>++++.
--- a/samples/Brainfuck/helloworld.bf
+++ b/samples/Brainfuck/helloworld.bf
@@ -0,0 +1,3 @@
+// Hello World
+
++++++++[>++++[>++>+++>+++>+<<<<-]>+>+>->>+[<]<-]>>.>---.+++++++..+++.>>.<-.<.+++.------.--------.>>+.>++.
--- a/samples/Brainfuck/rot13.bf
+++ b/samples/Brainfuck/rot13.bf
@@ -0,0 +1,30 @@
+# ROT13 cipher
+
+-,+[                         Read first character and start outer character reading loop
+    -[                       Skip forward if character is 0
+        >>++++[>++++++++<-]  Set up divisor (32) for division loop
+                               (MEMORY LAYOUT: dividend copy remainder divisor quotient zero zero)
+        <+<-[                Set up dividend (x minus 1) and enter division loop
+            >+>+>-[>>>]      Increase copy and remainder / reduce divisor / Normal case: skip forward
+            <[[>+<-]>>+>]    Special case: move remainder back to divisor and increase quotient
+            <<<<<-           Decrement dividend
+        ]                    End division loop
+    ]>>>[-]+                 End skip loop; zero former divisor and reuse space for a flag
+    >--[-[<->+++[-]]]<[         Zero that flag unless quotient was 2 or 3; zero quotient; check flag
+        ++++++++++++<[       If flag then set up divisor (13) for second division loop
+                               (MEMORY LAYOUT: zero copy dividend divisor remainder quotient zero zero)
+            >-[>+>>]         Reduce divisor; Normal case: increase remainder
+            >[+[<+>-]>+>>]   Special case: increase remainder / move it back to divisor / increase quotient
+            <<<<<-           Decrease dividend
+        ]                    End division loop
+        >>[<+>-]             Add remainder back to divisor to get a useful 13
+        >[                   Skip forward if quotient was 0
+            -[               Decrement quotient and skip forward if quotient was 1
+                -<<[-]>>     Zero quotient and divisor if quotient was 2
+            ]<<[<<->>-]>>    Zero divisor and subtract 13 from copy if quotient was 1
+        ]<<[<<+>>-]          Zero divisor and add 13 to copy if quotient was 0
+    ]                        End outer skip loop (jump to here if ((character minus 1)/32) was not 2 or 3)
+    <[-]                     Clear remainder from first division if second division was skipped
+    <.[-]                    Output ROT13ed character from copy and clear it
+    <-,+                     Read next character
+]                            End character reading loop
--- a/samples/C#/AssemblyInfo.cs
+++ b/samples/C#/AssemblyInfo.cs
@@ -0,0 +1,26 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following attributes. 
+// Change them to the values specific to your project.
+
+[assembly: AssemblyTitle("Simple")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes are used to specify the signing key for the assembly, 
+// if desired. See the Mono documentation for more information about signing.
+
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
--- a/samples/C#/BsonPropertyValue.cs
+++ b/samples/C#/BsonPropertyValue.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace MongoDB.Serialization.Descriptors
+{
+    internal class BsonPropertyValue
+    {
+        public bool IsDictionary { get; private set; }
+
+        public Type Type { get; private set; }
+
+        public object Value { get; private set; }
+
+        public BsonPropertyValue(Type type, object value, bool isDictionary)
+        {
+            Type = type;
+            Value = value;
+            IsDictionary = isDictionary;
+        }
+    }
+}
--- a/samples/C#/MongoExpressionVisitor.cs
+++ b/samples/C#/MongoExpressionVisitor.cs
@@ -0,0 +1,153 @@
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Linq.Expressions;
+
+namespace MongoDB.Linq.Expressions
+{
+    internal class MongoExpressionVisitor : ExpressionVisitor
+    {
+        protected override Expression Visit(Expression exp)
+        {
+            if (exp == null)
+                return null;
+            switch ((MongoExpressionType)exp.NodeType)
+            {
+                case MongoExpressionType.Collection:
+                    return VisitCollection((CollectionExpression)exp);
+                case MongoExpressionType.Field:
+                    return VisitField((FieldExpression)exp);
+                case MongoExpressionType.Projection:
+                    return VisitProjection((ProjectionExpression)exp);
+                case MongoExpressionType.Select:
+                    return VisitSelect((SelectExpression)exp);
+                case MongoExpressionType.Aggregate:
+                    return VisitAggregate((AggregateExpression)exp);
+                case MongoExpressionType.AggregateSubquery:
+                    return VisitAggregateSubquery((AggregateSubqueryExpression)exp);
+                case MongoExpressionType.Scalar:
+                    return VisitScalar((ScalarExpression)exp);
+                default:
+                    return base.Visit(exp);
+            }
+        }
+
+        protected virtual Expression VisitAggregate(AggregateExpression aggregate)
+        {
+            var exp = Visit(aggregate.Argument);
+            if (exp != aggregate.Argument)
+                return new AggregateExpression(aggregate.Type, aggregate.AggregateType, exp, aggregate.Distinct);
+
+            return aggregate;
+        }
+
+        protected virtual Expression VisitAggregateSubquery(AggregateSubqueryExpression aggregateSubquery)
+        {
+            Expression e = Visit(aggregateSubquery.AggregateAsSubquery);
+            ScalarExpression subquery = (ScalarExpression)e;
+            if (subquery != aggregateSubquery.AggregateAsSubquery)
+                return new AggregateSubqueryExpression(aggregateSubquery.GroupByAlias, aggregateSubquery.AggregateInGroupSelect, subquery);
+            return aggregateSubquery;
+        }
+
+        protected virtual Expression VisitCollection(CollectionExpression collection)
+        {
+            return collection;
+        }
+
+        protected virtual Expression VisitField(FieldExpression field)
+        {
+            var e = Visit(field.Expression);
+            if (field.Expression != e)
+                field = new FieldExpression(e, field.Alias, field.Name);
+
+            return field;
+        }
+
+        protected virtual Expression VisitProjection(ProjectionExpression projection)
+        {
+            var source = (SelectExpression)Visit(projection.Source);
+            var projector = Visit(projection.Projector);
+            if (source != projection.Source || projector != projection.Projector)
+                return new ProjectionExpression(source, projector, projection.Aggregator);
+            return projection;
+        }
+
+        protected ReadOnlyCollection<OrderExpression> VisitOrderBy(ReadOnlyCollection<OrderExpression> orderBys)
+        {
+            if (orderBys != null) 
+            {
+                List<OrderExpression> alternate = null;
+                for (int i = 0, n = orderBys.Count; i < n; i++) 
+                {
+                    OrderExpression expr = orderBys[i];
+                    Expression e = this.Visit(expr.Expression);
+                    if (alternate == null && e != expr.Expression) 
+                        alternate = orderBys.Take(i).ToList();
+                    if (alternate != null) 
+                        alternate.Add(new OrderExpression(expr.OrderType, e));
+                }
+                if (alternate != null) 
+                    return alternate.AsReadOnly();
+            }
+            return orderBys;
+        }
+
+        protected virtual Expression VisitScalar(ScalarExpression scalar)
+        {
+            SelectExpression select = (SelectExpression)Visit(scalar.Select);
+            if (select != scalar.Select)
+                return new ScalarExpression(scalar.Type, select);
+            return scalar;
+        }
+
+        protected virtual Expression VisitSelect(SelectExpression select)
+        {
+            var from = VisitSource(select.From);
+            var where = Visit(select.Where);
+            var groupBy = Visit(select.GroupBy);
+            var orderBy = VisitOrderBy(select.OrderBy);
+            var skip = Visit(select.Skip);
+            var take = Visit(select.Take);
+            var fields = VisitFieldDeclarationList(select.Fields);
+            if (from != select.From || where != select.Where || orderBy != select.OrderBy || groupBy != select.GroupBy || skip != select.Skip || take != select.Take || fields != select.Fields)
+                return new SelectExpression(select.Alias, fields, from, where, orderBy, groupBy, select.IsDistinct, skip, take);
+            return select;
+        }
+
+        protected virtual Expression VisitSource(Expression source)
+        {
+            return Visit(source);
+        }
+
+        protected virtual Expression VisitSubquery(SubqueryExpression subquery)
+        {
+            switch ((MongoExpressionType)subquery.NodeType)
+            {
+                case MongoExpressionType.Scalar:
+                    return VisitScalar((ScalarExpression)subquery);
+            }
+            return subquery;
+        }
+
+        protected virtual ReadOnlyCollection<FieldDeclaration> VisitFieldDeclarationList(ReadOnlyCollection<FieldDeclaration> fields)
+        {
+            if (fields == null)
+                return fields;
+
+            List<FieldDeclaration> alternate = null;
+            for (int i = 0, n = fields.Count; i < n; i++)
+            {
+                var f = fields[i];
+                var e = Visit(f.Expression);
+                if (f.Expression != e && alternate == null)
+                    alternate = fields.Take(i).ToList();
+                if (alternate != null)
+                    alternate.Add(new FieldDeclaration(f.Name, e));
+            }
+            if (alternate != null)
+                return alternate.AsReadOnly();
+            return fields;
+        }
+    }
+}
--- a/samples/C#/build.cake
+++ b/samples/C#/build.cake
@@ -0,0 +1,86 @@
+///////////////////////////////////////////////////////////////////////////////
+// ARGUMENTS
+///////////////////////////////////////////////////////////////////////////////
+
+var target = Argument<string>("target", "Default");
+var configuration = Argument<string>("configuration", "Release");
+
+///////////////////////////////////////////////////////////////////////////////
+// GLOBAL VARIABLES
+///////////////////////////////////////////////////////////////////////////////
+
+var solutions = GetFiles("./**/*.sln");
+var solutionPaths = solutions.Select(solution => solution.GetDirectory());
+
+///////////////////////////////////////////////////////////////////////////////
+// SETUP / TEARDOWN
+///////////////////////////////////////////////////////////////////////////////
+
+Setup(() =>
+{
+    // Executed BEFORE the first task.
+    Information("Running tasks...");
+});
+
+Teardown(() =>
+{
+    // Executed AFTER the last task.
+    Information("Finished running tasks.");
+});
+
+///////////////////////////////////////////////////////////////////////////////
+// TASK DEFINITIONS
+///////////////////////////////////////////////////////////////////////////////
+
+Task("Clean")
+    .Does(() =>
+{
+    // Clean solution directories.
+    foreach(var path in solutionPaths)
+    {
+        Information("Cleaning {0}", path);
+        CleanDirectories(path + "/**/bin/" + configuration);
+        CleanDirectories(path + "/**/obj/" + configuration);
+    }
+});
+
+Task("Restore")
+    .Does(() =>
+{
+    // Restore all NuGet packages.
+    foreach(var solution in solutions)
+    {
+        Information("Restoring {0}...", solution);
+        NuGetRestore(solution);
+    }
+});
+
+Task("Build")
+    .IsDependentOn("Clean")
+    .IsDependentOn("Restore")
+    .Does(() =>
+{
+    // Build all solutions.
+    foreach(var solution in solutions)
+    {
+        Information("Building {0}", solution);
+        MSBuild(solution, settings => 
+            settings.SetPlatformTarget(PlatformTarget.MSIL)
+                .WithProperty("TreatWarningsAsErrors","true")
+                .WithTarget("Build")
+                .SetConfiguration(configuration));
+    }
+});
+
+///////////////////////////////////////////////////////////////////////////////
+// TARGETS
+///////////////////////////////////////////////////////////////////////////////
+
+Task("Default")
+    .IsDependentOn("Build");
+
+///////////////////////////////////////////////////////////////////////////////
+// EXECUTION
+///////////////////////////////////////////////////////////////////////////////
+
+RunTarget(target);
--- a/samples/C++/16F88.h
+++ b/samples/C++/16F88.h
@@ -0,0 +1,86 @@
+/*
+ * This file is part of PIC
+ * Copyright © 2012 Rachel Mant (dx-mon@users.sourceforge.net)
+ *
+ * PIC is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PIC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+enum PIC16F88Instruction
+{
+	ADDWF,
+	ANDWF,
+	CLRF,
+	CLRW,
+	COMF,
+	DECF,
+	DECFSZ,
+	INCF,
+	INCFSZ,
+	IORWF,
+	MOVF,
+	MOVWF,
+	NOP,
+	RLF,
+	RRF,
+	SUBWF,
+	SWAPF,
+	XORWF,
+	BCF,
+	BSF,
+	BTFSC,
+	BTFSS,
+	ADDLW,
+	ANDLW,
+	CALL,
+	CLRWDT,
+	GOTO,
+	IORLW,
+	MOVLW,
+	RETFIE,
+	RETLW,
+	RETURN,
+	SLEEP,
+	SUBLW,
+	XORLW
+};
+
+class PIC16F88
+{
+public:
+	PIC16F88(ROM *ProgramMemory);
+	void Step();
+
+private:
+	uint8_t q;
+	bool nextIsNop, trapped;
+	Memory *memory;
+	ROM *program;
+	Stack<uint16_t, 8> *CallStack;
+	Register<uint16_t> *PC;
+	Register<> *WREG, *PCL, *STATUS, *PCLATCH;
+	PIC16F88Instruction inst;
+	uint16_t instrWord;
+
+private:
+	void DecodeInstruction();
+	void ProcessInstruction();
+
+	uint8_t GetBank();
+	uint8_t GetMemoryContents(uint8_t partialAddress);
+	void SetMemoryContents(uint8_t partialAddress, uint8_t newVal);
+	void CheckZero(uint8_t value);
+	void StoreValue(uint8_t value, bool updateZero);
+	uint8_t SetCarry(bool val);
+	uint16_t GetPCHFinalBits();
+};
--- a/samples/C++/ClasspathVMSystemProperties.inc
+++ b/samples/C++/ClasspathVMSystemProperties.inc
@@ -0,0 +1,57 @@
+//===- ClasspathVMSystem/Properties.cpp -----------------------------------===//
+//===--------------------- GNU classpath gnu/classpath/VMSystemProperties -===//
+//
+//                            The VMKit project
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <sys/utsname.h>
+
+#include "types.h"
+
+#include "Classpath.h"
+#include "JavaArray.h"
+#include "JavaClass.h"
+#include "JavaObject.h"
+#include "JavaThread.h"
+#include "JavaUpcalls.h"
+#include "Jnjvm.h"
+
+#include "SetProperties.inc"
+
+using namespace j3;
+
+extern "C" {
+
+
+JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_preInit(
+#ifdef NATIVE_JNI
+JNIEnv *env,
+jclass clazz,
+#endif
+JavaObject* prop) {
+  
+  llvm_gcroot(prop, 0);
+
+  BEGIN_NATIVE_EXCEPTION(0)
+
+  setProperties(prop);
+
+  END_NATIVE_EXCEPTION
+}
+
+extern "C" void Java_gnu_classpath_VMSystemProperties_postInit__Ljava_util_Properties_2(JavaObject* prop) {
+
+  llvm_gcroot(prop, 0);
+
+  BEGIN_NATIVE_EXCEPTION(0)
+
+  setCommandLineProperties(prop);
+
+  END_NATIVE_EXCEPTION
+}
+
+}
--- a/samples/C++/Entity.h
+++ b/samples/C++/Entity.h
@@ -0,0 +1,98 @@
+/** 
+* @file Entity.h
+* @page EntityPage Entity
+* @brief represent an entity in the game
+* @author vinz243
+* @version 0.1.0
+* This file represents an Entity in the game system
+* This parent type is a static entity which is shown and loaded into the Physics engine but never updated
+*/
+
+#ifndef ENTITY_H
+#define ENTITY_H
+
+#include "base.h"
+/// @namespace Whitedrop
+namespace Whitedrop {
+	/** @class Entity
+	* This parent type is a static entity which is shown and loaded into the Physics engine but never updated
+	*/
+	class Entity {
+	public:
+		/**
+		 * @brief Create static entity
+		 * @details creates a static entity instance according to the mesh and the id, the position
+		 * This needs to be attached to a World after!
+		 * The material name is not the file name but the material name!
+		 * @ref WorldPage
+		 * @param mesh the name of the mesh for the object, file must be in media/meshes
+		 * @param id an unique identifier for the object, shortest as possible
+		 * @param dimensions an Ogre::Vector3 which contains the dimensions in meter
+		 * @param position the Vector3 which contains it position 
+		 * @param material the material name
+		 */
+		Entity(std::string mesh, std::string id, Ogre::Vector3 dimensions, Ogre::Vector3 position, std::string material);
+		/**
+		 * @brief The copy constructor
+		 * @details A copy constr
+		 * 
+		 * @param ref the Entity to be copied from
+		 */
+		Entity(const Entity &ref);
+
+		/**
+		 * @brief The assignement operator
+		 * @details 
+		 * 
+		 * @param ent the entity to be copied
+		 */
+		Entity& operator=(const Entity ent);
+
+		/**
+		 * @brief destrctor
+		 * @details
+		 */
+		virtual ~Entity(void);
+
+		/**
+		 * @brief a constance type of the entity
+		 * @details depends of the class. 
+		 * May contain STATIC, DYNAMIC or ETHERAL
+		 */
+		const std::string type = "STATIC";
+
+		/**
+		 * @brief Attach the entity to specified sceneManager
+		 * @details This creates the OgreEntity using sceneMgr,
+		 * set material, create a Node with name as `<id>_n`,
+		 * scale it to match dimensions and translate the node to pos
+		 * @param sceneMgr the scene manager to use
+		 */
+		virtual void setup(Ogre::SceneManager* sceneMgr);
+
+		/**
+		 * @brief the update method
+		 * @details this method should be called on each world update.
+		 * Even though the method is necessary declared, the main impl of 
+		 * a static entity should be empty since it is not updated by physics
+		 * However, a Dynamic entity should implement this function in order to:
+		 * 1) Get from the physics engine the actor position in the physic world
+		 * 2) Update the OgreEntity position and rotation from the previous actor
+		 * @return whether it was successful or not, if falsey engine should stop
+		 */
+		virtual bool update(void);
+
+	protected:
+		std::string 			mMesh = "cube.mesh";
+		std::string 			mId;
+		std::string 			mMaterial;
+		Ogre::Vector3 			mDimensions;
+		Ogre::Vector3 			mPosition;
+		Ogre::Entity* 			mEntity;
+		Ogre::SceneNode* 		mNode;
+
+	};
+}
+
+
+#endif
--- a/samples/C++/Memory16F88.h
+++ b/samples/C++/Memory16F88.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of PIC
+ * Copyright © 2012 Rachel Mant (dx-mon@users.sourceforge.net)
+ *
+ * PIC is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PIC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Memory.h"
+
+class Memory16F88 : public Memory
+{
+private:
+	uint8_t memory[512];
+	std::map<uint32_t, MemoryLocation *> memoryMap;
+
+public:
+	Memory16F88();
+	uint8_t Dereference(uint8_t bank, uint8_t partialAddress);
+	uint8_t *Reference(uint8_t bank, uint8_t partialAddress);
+	uint8_t *operator [](uint32_t ref);
+};
--- a/samples/C++/ThreadedQueue.h
+++ b/samples/C++/ThreadedQueue.h
@@ -0,0 +1,76 @@
+/*
+ * This file is part of IRCBot
+ * Copyright © 2014 Rachel Mant (dx-mon@users.sourceforge.net)
+ *
+ * IRCBot is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * IRCBot is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __THREADED_QUEUE_H__
+#define __THREADED_QUEUE_H__
+
+#include <pthread.h>
+#include <queue>
+
+template<class T>
+class ThreadedQueue : public std::queue<T>
+{
+private:
+	pthread_mutex_t queueMutex;
+	pthread_cond_t queueCond;
+
+public:
+	ThreadedQueue()
+	{
+		pthread_mutexattr_t mutexAttrs;
+		pthread_condattr_t condAttrs;
+
+		pthread_mutexattr_init(&mutexAttrs);
+		pthread_mutexattr_settype(&mutexAttrs, PTHREAD_MUTEX_ERRORCHECK);
+		pthread_mutex_init(&queueMutex, &mutexAttrs);
+		pthread_mutexattr_destroy(&mutexAttrs);
+
+		pthread_condattr_init(&condAttrs);
+		pthread_condattr_setpshared(&condAttrs, PTHREAD_PROCESS_PRIVATE);
+		pthread_cond_init(&queueCond, &condAttrs);
+		pthread_condattr_destroy(&condAttrs);
+	}
+
+	~ThreadedQueue()
+	{
+		pthread_cond_destroy(&queueCond);
+		pthread_mutex_destroy(&queueMutex);
+	}
+
+	void waitItems()
+	{
+		pthread_mutex_lock(&queueMutex);
+		pthread_cond_wait(&queueCond, &queueMutex);
+		pthread_mutex_unlock(&queueMutex);
+	}
+
+	void signalItems()
+	{
+		pthread_mutex_lock(&queueMutex);
+		pthread_cond_broadcast(&queueCond);
+		pthread_mutex_unlock(&queueMutex);
+	}
+
+	void push(T item)
+	{
+		std::queue<T>::push(item);
+		signalItems();
+	}
+};
+
+#endif /*__THREADED_QUEUE_H__*/
--- a/samples/C++/bar.hh
+++ b/samples/C++/bar.hh
@@ -0,0 +1,10 @@
+class Bar
+{
+  protected:
+
+    char *name;
+
+  public:
+
+    void hello();
+}
--- a/samples/C++/epoll_reactor.ipp
+++ b/samples/C++/epoll_reactor.ipp
@@ -0,0 +1,664 @@
+//
+// detail/impl/epoll_reactor.ipp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+//
+// Copyright (c) 2003-2013 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BOOST_ASIO_DETAIL_IMPL_EPOLL_REACTOR_IPP
+#define BOOST_ASIO_DETAIL_IMPL_EPOLL_REACTOR_IPP
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma once
+#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
+
+#include <boost/asio/detail/config.hpp>
+
+#if defined(BOOST_ASIO_HAS_EPOLL)
+
+#include <cstddef>
+#include <sys/epoll.h>
+#include <boost/asio/detail/epoll_reactor.hpp>
+#include <boost/asio/detail/throw_error.hpp>
+#include <boost/asio/error.hpp>
+
+#if defined(BOOST_ASIO_HAS_TIMERFD)
+# include <sys/timerfd.h>
+#endif // defined(BOOST_ASIO_HAS_TIMERFD)
+
+#include <boost/asio/detail/push_options.hpp>
+
+namespace boost {
+namespace asio {
+namespace detail {
+
+epoll_reactor::epoll_reactor(boost::asio::io_service& io_service)
+  : boost::asio::detail::service_base<epoll_reactor>(io_service),
+    io_service_(use_service<io_service_impl>(io_service)),
+    mutex_(),
+    interrupter_(),
+    epoll_fd_(do_epoll_create()),
+    timer_fd_(do_timerfd_create()),
+    shutdown_(false)
+{
+  // Add the interrupter's descriptor to epoll.
+  epoll_event ev = { 0, { 0 } };
+  ev.events = EPOLLIN | EPOLLERR | EPOLLET;
+  ev.data.ptr = &interrupter_;
+  epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, interrupter_.read_descriptor(), &ev);
+  interrupter_.interrupt();
+
+  // Add the timer descriptor to epoll.
+  if (timer_fd_ != -1)
+  {
+    ev.events = EPOLLIN | EPOLLERR;
+    ev.data.ptr = &timer_fd_;
+    epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, timer_fd_, &ev);
+  }
+}
+
+epoll_reactor::~epoll_reactor()
+{
+  if (epoll_fd_ != -1)
+    close(epoll_fd_);
+  if (timer_fd_ != -1)
+    close(timer_fd_);
+}
+
+void epoll_reactor::shutdown_service()
+{
+  mutex::scoped_lock lock(mutex_);
+  shutdown_ = true;
+  lock.unlock();
+
+  op_queue<operation> ops;
+
+  while (descriptor_state* state = registered_descriptors_.first())
+  {
+    for (int i = 0; i < max_ops; ++i)
+      ops.push(state->op_queue_[i]);
+    state->shutdown_ = true;
+    registered_descriptors_.free(state);
+  }
+
+  timer_queues_.get_all_timers(ops);
+
+  io_service_.abandon_operations(ops);
+}
+
+void epoll_reactor::fork_service(boost::asio::io_service::fork_event fork_ev)
+{
+  if (fork_ev == boost::asio::io_service::fork_child)
+  {
+    if (epoll_fd_ != -1)
+      ::close(epoll_fd_);
+    epoll_fd_ = -1;
+    epoll_fd_ = do_epoll_create();
+
+    if (timer_fd_ != -1)
+      ::close(timer_fd_);
+    timer_fd_ = -1;
+    timer_fd_ = do_timerfd_create();
+
+    interrupter_.recreate();
+
+    // Add the interrupter's descriptor to epoll.
+    epoll_event ev = { 0, { 0 } };
+    ev.events = EPOLLIN | EPOLLERR | EPOLLET;
+    ev.data.ptr = &interrupter_;
+    epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, interrupter_.read_descriptor(), &ev);
+    interrupter_.interrupt();
+
+    // Add the timer descriptor to epoll.
+    if (timer_fd_ != -1)
+    {
+      ev.events = EPOLLIN | EPOLLERR;
+      ev.data.ptr = &timer_fd_;
+      epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, timer_fd_, &ev);
+    }
+
+    update_timeout();
+
+    // Re-register all descriptors with epoll.
+    mutex::scoped_lock descriptors_lock(registered_descriptors_mutex_);
+    for (descriptor_state* state = registered_descriptors_.first();
+        state != 0; state = state->next_)
+    {
+      ev.events = state->registered_events_;
+      ev.data.ptr = state;
+      int result = epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, state->descriptor_, &ev);
+      if (result != 0)
+      {
+        boost::system::error_code ec(errno,
+            boost::asio::error::get_system_category());
+        boost::asio::detail::throw_error(ec, "epoll re-registration");
+      }
+    }
+  }
+}
+
+void epoll_reactor::init_task()
+{
+  io_service_.init_task();
+}
+
+int epoll_reactor::register_descriptor(socket_type descriptor,
+    epoll_reactor::per_descriptor_data& descriptor_data)
+{
+  descriptor_data = allocate_descriptor_state();
+
+  {
+    mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);
+
+    descriptor_data->reactor_ = this;
+    descriptor_data->descriptor_ = descriptor;
+    descriptor_data->shutdown_ = false;
+  }
+
+  epoll_event ev = { 0, { 0 } };
+  ev.events = EPOLLIN | EPOLLERR | EPOLLHUP | EPOLLPRI | EPOLLET;
+  descriptor_data->registered_events_ = ev.events;
+  ev.data.ptr = descriptor_data;
+  int result = epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, descriptor, &ev);
+  if (result != 0)
+    return errno;
+
+  return 0;
+}
+
+int epoll_reactor::register_internal_descriptor(
+    int op_type, socket_type descriptor,
+    epoll_reactor::per_descriptor_data& descriptor_data, reactor_op* op)
+{
+  descriptor_data = allocate_descriptor_state();
+
+  {
+    mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);
+
+    descriptor_data->reactor_ = this;
+    descriptor_data->descriptor_ = descriptor;
+    descriptor_data->shutdown_ = false;
+    descriptor_data->op_queue_[op_type].push(op);
+  }
+
+  epoll_event ev = { 0, { 0 } };
+  ev.events = EPOLLIN | EPOLLERR | EPOLLHUP | EPOLLPRI | EPOLLET;
+  descriptor_data->registered_events_ = ev.events;
+  ev.data.ptr = descriptor_data;
+  int result = epoll_ctl(epoll_fd_, EPOLL_CTL_ADD, descriptor, &ev);
+  if (result != 0)
+    return errno;
+
+  return 0;
+}
+
+void epoll_reactor::move_descriptor(socket_type,
+    epoll_reactor::per_descriptor_data& target_descriptor_data,
+    epoll_reactor::per_descriptor_data& source_descriptor_data)
+{
+  target_descriptor_data = source_descriptor_data;
+  source_descriptor_data = 0;
+}
+
+void epoll_reactor::start_op(int op_type, socket_type descriptor,
+    epoll_reactor::per_descriptor_data& descriptor_data, reactor_op* op,
+    bool is_continuation, bool allow_speculative)
+{
+  if (!descriptor_data)
+  {
+    op->ec_ = boost::asio::error::bad_descriptor;
+    post_immediate_completion(op, is_continuation);
+    return;
+  }
+
+  mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);
+
+  if (descriptor_data->shutdown_)
+  {
+    post_immediate_completion(op, is_continuation);
+    return;
+  }
+
+  if (descriptor_data->op_queue_[op_type].empty())
+  {
+    if (allow_speculative
+        && (op_type != read_op
+          || descriptor_data->op_queue_[except_op].empty()))
+    {
+      if (op->perform())
+      {
+        descriptor_lock.unlock();
+        io_service_.post_immediate_completion(op, is_continuation);
+        return;
+      }
+
+      if (op_type == write_op)
+      {
+        if ((descriptor_data->registered_events_ & EPOLLOUT) == 0)
+        {
+          epoll_event ev = { 0, { 0 } };
+          ev.events = descriptor_data->registered_events_ | EPOLLOUT;
+          ev.data.ptr = descriptor_data;
+          if (epoll_ctl(epoll_fd_, EPOLL_CTL_MOD, descriptor, &ev) == 0)
+          {
+            descriptor_data->registered_events_ |= ev.events;
+          }
+          else
+          {
+            op->ec_ = boost::system::error_code(errno,
+                boost::asio::error::get_system_category());
+            io_service_.post_immediate_completion(op, is_continuation);
+            return;
+          }
+        }
+      }
+    }
+    else
+    {
+      if (op_type == write_op)
+      {
+        descriptor_data->registered_events_ |= EPOLLOUT;
+      }
+
+      epoll_event ev = { 0, { 0 } };
+      ev.events = descriptor_data->registered_events_;
+      ev.data.ptr = descriptor_data;
+      epoll_ctl(epoll_fd_, EPOLL_CTL_MOD, descriptor, &ev);
+    }
+  }
+
+  descriptor_data->op_queue_[op_type].push(op);
+  io_service_.work_started();
+}
+
+void epoll_reactor::cancel_ops(socket_type,
+    epoll_reactor::per_descriptor_data& descriptor_data)
+{
+  if (!descriptor_data)
+    return;
+
+  mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);
+
+  op_queue<operation> ops;
+  for (int i = 0; i < max_ops; ++i)
+  {
+    while (reactor_op* op = descriptor_data->op_queue_[i].front())
+    {
+      op->ec_ = boost::asio::error::operation_aborted;
+      descriptor_data->op_queue_[i].pop();
+      ops.push(op);
+    }
+  }
+
+  descriptor_lock.unlock();
+
+  io_service_.post_deferred_completions(ops);
+}
+
+void epoll_reactor::deregister_descriptor(socket_type descriptor,
+    epoll_reactor::per_descriptor_data& descriptor_data, bool closing)
+{
+  if (!descriptor_data)
+    return;
+
+  mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);
+
+  if (!descriptor_data->shutdown_)
+  {
+    if (closing)
+    {
+      // The descriptor will be automatically removed from the epoll set when
+      // it is closed.
+    }
+    else
+    {
+      epoll_event ev = { 0, { 0 } };
+      epoll_ctl(epoll_fd_, EPOLL_CTL_DEL, descriptor, &ev);
+    }
+
+    op_queue<operation> ops;
+    for (int i = 0; i < max_ops; ++i)
+    {
+      while (reactor_op* op = descriptor_data->op_queue_[i].front())
+      {
+        op->ec_ = boost::asio::error::operation_aborted;
+        descriptor_data->op_queue_[i].pop();
+        ops.push(op);
+      }
+    }
+
+    descriptor_data->descriptor_ = -1;
+    descriptor_data->shutdown_ = true;
+
+    descriptor_lock.unlock();
+
+    free_descriptor_state(descriptor_data);
+    descriptor_data = 0;
+
+    io_service_.post_deferred_completions(ops);
+  }
+}
+
+void epoll_reactor::deregister_internal_descriptor(socket_type descriptor,
+    epoll_reactor::per_descriptor_data& descriptor_data)
+{
+  if (!descriptor_data)
+    return;
+
+  mutex::scoped_lock descriptor_lock(descriptor_data->mutex_);
+
+  if (!descriptor_data->shutdown_)
+  {
+    epoll_event ev = { 0, { 0 } };
+    epoll_ctl(epoll_fd_, EPOLL_CTL_DEL, descriptor, &ev);
+
+    op_queue<operation> ops;
+    for (int i = 0; i < max_ops; ++i)
+      ops.push(descriptor_data->op_queue_[i]);
+
+    descriptor_data->descriptor_ = -1;
+    descriptor_data->shutdown_ = true;
+
+    descriptor_lock.unlock();
+
+    free_descriptor_state(descriptor_data);
+    descriptor_data = 0;
+  }
+}
+
+void epoll_reactor::run(bool block, op_queue<operation>& ops)
+{
+  // This code relies on the fact that the task_io_service queues the reactor
+  // task behind all descriptor operations generated by this function. This
+  // means, that by the time we reach this point, any previously returned
+  // descriptor operations have already been dequeued. Therefore it is now safe
+  // for us to reuse and return them for the task_io_service to queue again.
+
+  // Calculate a timeout only if timerfd is not used.
+  int timeout;
+  if (timer_fd_ != -1)
+    timeout = block ? -1 : 0;
+  else
+  {
+    mutex::scoped_lock lock(mutex_);
+    timeout = block ? get_timeout() : 0;
+  }
+
+  // Block on the epoll descriptor.
+  epoll_event events[128];
+  int num_events = epoll_wait(epoll_fd_, events, 128, timeout);
+
+#if defined(BOOST_ASIO_HAS_TIMERFD)
+  bool check_timers = (timer_fd_ == -1);
+#else // defined(BOOST_ASIO_HAS_TIMERFD)
+  bool check_timers = true;
+#endif // defined(BOOST_ASIO_HAS_TIMERFD)
+
+  // Dispatch the waiting events.
+  for (int i = 0; i < num_events; ++i)
+  {
+    void* ptr = events[i].data.ptr;
+    if (ptr == &interrupter_)
+    {
+      // No need to reset the interrupter since we're leaving the descriptor
+      // in a ready-to-read state and relying on edge-triggered notifications
+      // to make it so that we only get woken up when the descriptor's epoll
+      // registration is updated.
+
+#if defined(BOOST_ASIO_HAS_TIMERFD)
+      if (timer_fd_ == -1)
+        check_timers = true;
+#else // defined(BOOST_ASIO_HAS_TIMERFD)
+      check_timers = true;
+#endif // defined(BOOST_ASIO_HAS_TIMERFD)
+    }
+#if defined(BOOST_ASIO_HAS_TIMERFD)
+    else if (ptr == &timer_fd_)
+    {
+      check_timers = true;
+    }
+#endif // defined(BOOST_ASIO_HAS_TIMERFD)
+    else
+    {
+      // The descriptor operation doesn't count as work in and of itself, so we
+      // don't call work_started() here. This still allows the io_service to
+      // stop if the only remaining operations are descriptor operations.
+      descriptor_state* descriptor_data = static_cast<descriptor_state*>(ptr);
+      descriptor_data->set_ready_events(events[i].events);
+      ops.push(descriptor_data);
+    }
+  }
+
+  if (check_timers)
+  {
+    mutex::scoped_lock common_lock(mutex_);
+    timer_queues_.get_ready_timers(ops);
+
+#if defined(BOOST_ASIO_HAS_TIMERFD)
+    if (timer_fd_ != -1)
+    {
+      itimerspec new_timeout;
+      itimerspec old_timeout;
+      int flags = get_timeout(new_timeout);
+      timerfd_settime(timer_fd_, flags, &new_timeout, &old_timeout);
+    }
+#endif // defined(BOOST_ASIO_HAS_TIMERFD)
+  }
+}
+
+void epoll_reactor::interrupt()
+{
+  epoll_event ev = { 0, { 0 } };
+  ev.events = EPOLLIN | EPOLLERR | EPOLLET;
+  ev.data.ptr = &interrupter_;
+  epoll_ctl(epoll_fd_, EPOLL_CTL_MOD, interrupter_.read_descriptor(), &ev);
+}
+
+int epoll_reactor::do_epoll_create()
+{
+#if defined(EPOLL_CLOEXEC)
+  int fd = epoll_create1(EPOLL_CLOEXEC);
+#else // defined(EPOLL_CLOEXEC)
+  int fd = -1;
+  errno = EINVAL;
+#endif // defined(EPOLL_CLOEXEC)
+
+  if (fd == -1 && (errno == EINVAL || errno == ENOSYS))
+  {
+    fd = epoll_create(epoll_size);
+    if (fd != -1)
+      ::fcntl(fd, F_SETFD, FD_CLOEXEC);
+  }
+
+  if (fd == -1)
+  {
+    boost::system::error_code ec(errno,
+        boost::asio::error::get_system_category());
+    boost::asio::detail::throw_error(ec, "epoll");
+  }
+
+  return fd;
+}
+
+int epoll_reactor::do_timerfd_create()
+{
+#if defined(BOOST_ASIO_HAS_TIMERFD)
+# if defined(TFD_CLOEXEC)
+  int fd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC);
+# else // defined(TFD_CLOEXEC)
+  int fd = -1;
+  errno = EINVAL;
+# endif // defined(TFD_CLOEXEC)
+
+  if (fd == -1 && errno == EINVAL)
+  {
+    fd = timerfd_create(CLOCK_MONOTONIC, 0);
+    if (fd != -1)
+      ::fcntl(fd, F_SETFD, FD_CLOEXEC);
+  }
+
+  return fd;
+#else // defined(BOOST_ASIO_HAS_TIMERFD)
+  return -1;
+#endif // defined(BOOST_ASIO_HAS_TIMERFD)
+}
+
+epoll_reactor::descriptor_state* epoll_reactor::allocate_descriptor_state()
+{
+  mutex::scoped_lock descriptors_lock(registered_descriptors_mutex_);
+  return registered_descriptors_.alloc();
+}
+
+void epoll_reactor::free_descriptor_state(epoll_reactor::descriptor_state* s)
+{
+  mutex::scoped_lock descriptors_lock(registered_descriptors_mutex_);
+  registered_descriptors_.free(s);
+}
+
+void epoll_reactor::do_add_timer_queue(timer_queue_base& queue)
+{
+  mutex::scoped_lock lock(mutex_);
+  timer_queues_.insert(&queue);
+}
+
+void epoll_reactor::do_remove_timer_queue(timer_queue_base& queue)
+{
+  mutex::scoped_lock lock(mutex_);
+  timer_queues_.erase(&queue);
+}
+
+void epoll_reactor::update_timeout()
+{
+#if defined(BOOST_ASIO_HAS_TIMERFD)
+  if (timer_fd_ != -1)
+  {
+    itimerspec new_timeout;
+    itimerspec old_timeout;
+    int flags = get_timeout(new_timeout);
+    timerfd_settime(timer_fd_, flags, &new_timeout, &old_timeout);
+    return;
+  }
+#endif // defined(BOOST_ASIO_HAS_TIMERFD)
+  interrupt();
+}
+
+int epoll_reactor::get_timeout()
+{
+  // By default we will wait no longer than 5 minutes. This will ensure that
+  // any changes to the system clock are detected after no longer than this.
+  return timer_queues_.wait_duration_msec(5 * 60 * 1000);
+}
+
+#if defined(BOOST_ASIO_HAS_TIMERFD)
+int epoll_reactor::get_timeout(itimerspec& ts)
+{
+  ts.it_interval.tv_sec = 0;
+  ts.it_interval.tv_nsec = 0;
+
+  long usec = timer_queues_.wait_duration_usec(5 * 60 * 1000 * 1000);
+  ts.it_value.tv_sec = usec / 1000000;
+  ts.it_value.tv_nsec = usec ? (usec % 1000000) * 1000 : 1;
+
+  return usec ? 0 : TFD_TIMER_ABSTIME;
+}
+#endif // defined(BOOST_ASIO_HAS_TIMERFD)
+
+struct epoll_reactor::perform_io_cleanup_on_block_exit
+{
+  explicit perform_io_cleanup_on_block_exit(epoll_reactor* r)
+    : reactor_(r), first_op_(0)
+  {
+  }
+
+  ~perform_io_cleanup_on_block_exit()
+  {
+    if (first_op_)
+    {
+      // Post the remaining completed operations for invocation.
+      if (!ops_.empty())
+        reactor_->io_service_.post_deferred_completions(ops_);
+
+      // A user-initiated operation has completed, but there's no need to
+      // explicitly call work_finished() here. Instead, we'll take advantage of
+      // the fact that the task_io_service will call work_finished() once we
+      // return.
+    }
+    else
+    {
+      // No user-initiated operations have completed, so we need to compensate
+      // for the work_finished() call that the task_io_service will make once
+      // this operation returns.
+      reactor_->io_service_.work_started();
+    }
+  }
+
+  epoll_reactor* reactor_;
+  op_queue<operation> ops_;
+  operation* first_op_;
+};
+
+epoll_reactor::descriptor_state::descriptor_state()
+  : operation(&epoll_reactor::descriptor_state::do_complete)
+{
+}
+
+operation* epoll_reactor::descriptor_state::perform_io(uint32_t events)
+{
+  mutex_.lock();
+  perform_io_cleanup_on_block_exit io_cleanup(reactor_);
+  mutex::scoped_lock descriptor_lock(mutex_, mutex::scoped_lock::adopt_lock);
+
+  // Exception operations must be processed first to ensure that any
+  // out-of-band data is read before normal data.
+  static const int flag[max_ops] = { EPOLLIN, EPOLLOUT, EPOLLPRI };
+  for (int j = max_ops - 1; j >= 0; --j)
+  {
+    if (events & (flag[j] | EPOLLERR | EPOLLHUP))
+    {
+      while (reactor_op* op = op_queue_[j].front())
+      {
+        if (op->perform())
+        {
+          op_queue_[j].pop();
+          io_cleanup.ops_.push(op);
+        }
+        else
+          break;
+      }
+    }
+  }
+
+  // The first operation will be returned for completion now. The others will
+  // be posted for later by the io_cleanup object's destructor.
+  io_cleanup.first_op_ = io_cleanup.ops_.front();
+  io_cleanup.ops_.pop();
+  return io_cleanup.first_op_;
+}
+
+void epoll_reactor::descriptor_state::do_complete(
+    io_service_impl* owner, operation* base,
+    const boost::system::error_code& ec, std::size_t bytes_transferred)
+{
+  if (owner)
+  {
+    descriptor_state* descriptor_data = static_cast<descriptor_state*>(base);
+    uint32_t events = static_cast<uint32_t>(bytes_transferred);
+    if (operation* op = descriptor_data->perform_io(events))
+    {
+      op->complete(*owner, ec, 0);
+    }
+  }
+}
+
+} // namespace detail
+} // namespace asio
+} // namespace boost
+
+#include <boost/asio/detail/pop_options.hpp>
+
+#endif // defined(BOOST_ASIO_HAS_EPOLL)
+
+#endif // BOOST_ASIO_DETAIL_IMPL_EPOLL_REACTOR_IPP
--- a/samples/C++/initClasses.inc
+++ b/samples/C++/initClasses.inc
--- a/samples/C++/instances.inc
+++ b/samples/C++/instances.inc
@@ -0,0 +1,34 @@
+#include "QPBO.h"
+
+#ifdef _MSC_VER
+#pragma warning(disable: 4661)
+#endif
+
+// Instantiations
+
+template class QPBO<int>;
+template class QPBO<float>;
+template class QPBO<double>;
+
+template <> 
+	inline void QPBO<int>::get_type_information(char*& type_name, char*& type_format)
+{
+	type_name = "int";
+	type_format = "d";
+}
+
+template <> 
+	inline void QPBO<float>::get_type_information(char*& type_name, char*& type_format)
+{
+	type_name = "float";
+	type_format = "f";
+}
+
+template <> 
+	inline void QPBO<double>::get_type_information(char*& type_name, char*& type_format)
+{
+	type_name = "double";
+	type_format = "Lf";
+}
+
+
--- a/samples/C++/qsciprinter.cp
+++ b/samples/C++/qsciprinter.cp
@@ -0,0 +1,116 @@
+// This module defines interface to the QsciPrinter class.
+//
+// Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>
+// 
+// This file is part of QScintilla.
+// 
+// This file may be used under the terms of the GNU General Public
+// License versions 2.0 or 3.0 as published by the Free Software
+// Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
+// included in the packaging of this file.  Alternatively you may (at
+// your option) use any later version of the GNU General Public
+// License if such license has been publicly approved by Riverbank
+// Computing Limited (or its successors, if any) and the KDE Free Qt
+// Foundation. In addition, as a special exception, Riverbank gives you
+// certain additional rights. These rights are described in the Riverbank
+// GPL Exception version 1.1, which can be found in the file
+// GPL_EXCEPTION.txt in this package.
+// 
+// If you are unsure which license is appropriate for your use, please
+// contact the sales department at sales@riverbankcomputing.com.
+// 
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+#ifndef QSCIPRINTER_H
+#define QSCIPRINTER_H
+
+#ifdef __APPLE__
+extern "C++" {
+#endif
+
+#include <qprinter.h>
+
+#include <Qsci/qsciglobal.h>
+#include <Qsci/qsciscintilla.h>
+
+
+QT_BEGIN_NAMESPACE
+class QRect;
+class QPainter;
+QT_END_NAMESPACE
+
+class QsciScintillaBase;
+
+
+//! \brief The QsciPrinter class is a sub-class of the Qt QPrinter class that
+//! is able to print the text of a Scintilla document.
+//!
+//! The class can be further sub-classed to alter to layout of the text, adding
+//! headers and footers for example.
+class QSCINTILLA_EXPORT QsciPrinter : public QPrinter
+{
+public:
+    //! Constructs a printer paint device with mode \a mode.
+    QsciPrinter(PrinterMode mode = ScreenResolution);
+
+    //! Destroys the QsciPrinter instance.
+    virtual ~QsciPrinter();
+
+    //! Format a page, by adding headers and footers for example, before the
+    //! document text is drawn on it.  \a painter is the painter to be used to
+    //! add customised text and graphics.  \a drawing is true if the page is
+    //! actually being drawn rather than being sized.  \a painter drawing
+    //! methods must only be called when \a drawing is true.  \a area is the
+    //! area of the page that will be used to draw the text.  This should be
+    //! modified if it is necessary to reserve space for any customised text or
+    //! graphics.  By default the area is relative to the printable area of the
+    //! page.  Use QPrinter::setFullPage() because calling printRange() if you
+    //! want to try and print over the whole page.  \a pagenr is the number of
+    //! the page.  The first page is numbered 1.
+    virtual void formatPage(QPainter &painter, bool drawing, QRect &area,
+            int pagenr);
+
+    //! Return the number of points to add to each font when printing.
+    //!
+    //! \sa setMagnification()
+    int magnification() const {return mag;}
+
+    //! Sets the number of points to add to each font when printing to \a
+    //! magnification.
+    //!
+    //! \sa magnification()
+    virtual void setMagnification(int magnification);
+
+    //! Print a range of lines from the Scintilla instance \a qsb.  \a from is
+    //! the first line to print and a negative value signifies the first line
+    //! of text.  \a to is the last line to print and a negative value
+    //! signifies the last line of text.  true is returned if there was no
+    //! error.
+    virtual int printRange(QsciScintillaBase *qsb, int from = -1, int to = -1);
+
+    //! Return the line wrap mode used when printing.  The default is
+    //! QsciScintilla::WrapWord.
+    //!
+    //! \sa setWrapMode()
+    QsciScintilla::WrapMode wrapMode() const {return wrap;}
+
+    //! Sets the line wrap mode used when printing to \a wmode.
+    //!
+    //! \sa wrapMode()
+    virtual void setWrapMode(QsciScintilla::WrapMode wmode);
+
+private:
+    int mag;
+    QsciScintilla::WrapMode wrap;
+
+    QsciPrinter(const QsciPrinter &);
+    QsciPrinter &operator=(const QsciPrinter &);
+};
+
+#ifdef __APPLE__
+}
+#endif
+
+#endif
--- a/samples/C/2D.C
+++ b/samples/C/2D.C
@@ -0,0 +1,145 @@
+#include "2D.h"
+#include <math.h>
+
+void set_vgabasemem(void)
+{
+    ULONG vgabase;
+    SELECTOR tmp;
+    asm mov [tmp], ds
+    dpmi_get_sel_base(&vgabase, tmp);
+    vgabasemem = (char *)(-vgabase + 0xa0000);
+}
+
+void drw_chdis(int mode) // change the display!
+{
+    regs.b.ah = 0x00;   // seet theh display moode
+    regs.b.al = mode;  // change it to the mode like innit
+    regs.h.flags = 0x72;// Set the dingoes kidneys out of FLAGS eh?
+    regs.h.ss = 0;     // Like, totally set the stack segment
+    regs.h.sp = 0;     // Set tha stack pointaaaaahhhhh!!!
+    dpmi_simulate_real_interrupt(0x10, &regs);
+}
+
+void drw_pix(int x, int y, enum COLORS col)
+{
+    *VGAPIX(x, y) = col;
+}
+
+void drw_line(int x0, int y0, int x1, int y1, enum COLORS col)
+{
+    // Going for the optimized version of bresenham's line algo.        
+    int stp = (abs(y0 - y1) > abs(x0 - x1));
+    int tmp, dx, dy, err, yi, i, j; // yi = y excrement
+    if (stp) {
+        // swappity swap
+        tmp = y0;
+        y0 = x0;
+        x0 = tmp;
+        
+        tmp = y1;
+        y1 = x1;
+        x1 = tmp;
+    }
+    // AAAAND NOW WE MUST DO ZEES AGAIN :(
+    // I'm sure there was a func somewhere that does this? :P
+    if (x0 > x1) {
+        tmp = x0;
+        x0 = x1;
+        x1 = tmp;
+        
+        tmp = y0;
+        y0 = y1;
+        y1 = tmp;
+    }
+    dx = (x1 - x0);
+    dy = (abs(y1 - y0));
+    err = (dx / 2);
+
+    if (y0 < y1)
+        yi = 1;
+    else
+        yi = -1;
+    j = y0;
+    for (i = x0; i < x1; i++)
+    {
+        if (stp)
+            *VGAPIX(j, i) = col;
+        else
+            *VGAPIX(i, j) = col;
+
+        err -= dy;
+        if (err < 0) {
+            j += yi;
+            err += dx;
+        }
+    }
+}
+
+void drw_rectl(int x, int y, int w, int h, enum COLORS col)
+{
+    drw_line(x, y, x+w, y, col);
+    drw_line(x+w, y, x+w, y+h, col);
+
+    drw_line(x, y, x, y+h, col);
+    drw_line(x, y+h, x+w+1, y+h, col);
+}
+
+void drw_rectf(int x, int y, int w, int h, enum COLORS col)
+{
+    int i, j;
+    for (j = y; j < x+h; j++) {
+        for (i = x; i < y+w; i++) {
+            *VGAPIX(i, j) = col;
+        }
+    }
+}
+
+void drw_circl(int x, int y, int rad, enum COLORS col)
+{
+    int mang, i; // max angle, haha
+    int px, py;
+    mang = 360; // Yeah yeah I'll switch to rad later
+    for (i = 0; i <= mang; i++)
+    {   
+        px = cos(i)*rad + x; // + px; // causes some really cools effects! :D
+        py = sin(i)*rad + y; // + py;
+        *VGAPIX(px, py) = col;
+    }
+}
+
+void drw_tex(int x, int y, int w, int h, enum COLORS tex[])
+{   // i*w+j
+    int i, j;
+    for (i = 0; i < w; i++)
+    {
+        for (j = 0; j < h; j++)
+        {
+            *VGAPIX(x+i, y+j) = tex[j*w+i];
+        }
+    }
+}
+
+void 2D_init(void)
+{
+    set_vgabasemem();
+    drw_chdis(0x13);
+}
+
+void 2D_exit(void)
+{
+    drw_chdis(3);
+}
+/*
+int main()
+{
+    set_vgabasemem();
+    drw_chdis(0x13);
+
+    while(!kbhit()) {
+        if ((getch()) == 0x1b) // escape
+            break;
+    }
+    drw_chdis(3);
+    return 0;
+}
+*/
--- a/samples/C/2D.H
+++ b/samples/C/2D.H
@@ -0,0 +1,29 @@
+#ifndef __2DGFX
+#define __2DGFX
+// Includes
+#include <stdio.h>
+#include <math.h>
+#include <conio.h>
+#include <dpmi.h>
+
+// Defines
+#define VGAPIX(x,y) (vgabasemem + (x) + (y) * 320)
+
+// Variables
+char * vgabasemem;
+DPMI_REGS regs;
+
+// Drawing functions:
+//void setvgabasemem(void);
+void drw_chdis(int mode); // draw_func_change_display
+void drw_pix(int x, int y, enum COLORS col);
+void drw_line(int x0, int y0, int x1, int y1, enum COLORS col);
+void drw_rectl(int x, int y, int w, int h, enum COLORS col);
+void drw_rectf(int x, int y, int w, int h, enum COLORS col);
+void drw_cirl(int x, int y, int rad, enum COLORS col);
+void drw_tex(int x, int y, int w, int h, enum COLORS tex[]);
+void 2D_init(void);
+void 2D_exit(void);
+
+
+#endif
--- a/samples/C/ArrowLeft.h
+++ b/samples/C/ArrowLeft.h
@@ -0,0 +1,93 @@
+/*
+ * This file is part of GTK++ (libGTK++)
+ * Copyright © 2012 Rachel Mant (dx-mon@users.sourceforge.net)
+ *
+ * GTK++ is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GTK++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* GdkPixbuf RGBA C-Source image dump */
+
+#ifdef __SUNPRO_C
+#pragma align 4 (ArrowLeft)
+#endif
+#ifdef __GNUC__
+static const uint8_t ArrowLeft[] __attribute__ ((__aligned__ (4))) = 
+#else
+static const uint8_t ArrowLeft[] = 
+#endif
+{ ""
+  /* Pixbuf magic (0x47646b50) */
+  "GdkP"
+  /* length: header (24) + pixel_data (1600) */
+  "\0\0\6X"
+  /* pixdata_type (0x1010002) */
+  "\1\1\0\2"
+  /* rowstride (80) */
+  "\0\0\0P"
+  /* width (20) */
+  "\0\0\0\24"
+  /* height (20) */
+  "\0\0\0\24"
+  /* pixel_data: */
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377"
+  "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0"
+  "\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0"};
+
+
--- a/samples/C/GLKMatrix4.h
+++ b/samples/C/GLKMatrix4.h
@@ -0,0 +1,903 @@
+//
+//  GLKMatrix4.h
+//  GLKit
+//
+//  Copyright (c) 2011, Apple Inc. All rights reserved.
+//
+
+#ifndef __GLK_MATRIX_4_H
+#define __GLK_MATRIX_4_H
+
+#include <stddef.h>
+#include <stdbool.h>
+#include <math.h>
+
+#if defined(__ARM_NEON__)
+#include <arm_neon.h>
+#endif
+
+#include <GLKit/GLKMathTypes.h>
+#include <GLKit/GLKVector3.h>
+#include <GLKit/GLKVector4.h>
+#include <GLKit/GLKQuaternion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#pragma mark -
+#pragma mark Prototypes
+#pragma mark -
+
+extern const GLKMatrix4 GLKMatrix4Identity;
+
+/*
+ m30, m31, and m32 correspond to the translation values tx, ty, tz, respectively.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4Make(float m00, float m01, float m02, float m03,
+                                            float m10, float m11, float m12, float m13,
+                                            float m20, float m21, float m22, float m23,
+                                            float m30, float m31, float m32, float m33);
+
+/*
+ m03, m13, and m23 correspond to the translation values tx, ty, tz, respectively.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakeAndTranspose(float m00, float m01, float m02, float m03,
+                                                        float m10, float m11, float m12, float m13,
+                                                        float m20, float m21, float m22, float m23,
+                                                        float m30, float m31, float m32, float m33);
+
+/*
+ m[12], m[13], and m[14] correspond to the translation values tx, ty, and tz, respectively.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithArray(float values[16]);
+
+/*
+ m[3], m[7], and m[11] correspond to the translation values tx, ty, and tz, respectively.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithArrayAndTranspose(float values[16]);
+
+/*
+ row0, row1, and row2's last component should correspond to the translation values tx, ty, and tz, respectively.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithRows(GLKVector4 row0,
+                                                    GLKVector4 row1,
+                                                    GLKVector4 row2,
+                                                    GLKVector4 row3);
+
+/*
+ column3's first three components should correspond to the translation values tx, ty, and tz.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithColumns(GLKVector4 column0,
+                                                       GLKVector4 column1,
+                                                       GLKVector4 column2,
+                                                       GLKVector4 column3);
+
+/*
+ The quaternion will be normalized before conversion.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithQuaternion(GLKQuaternion quaternion);
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeTranslation(float tx, float ty, float tz);
+static __inline__ GLKMatrix4 GLKMatrix4MakeScale(float sx, float sy, float sz);
+static __inline__ GLKMatrix4 GLKMatrix4MakeRotation(float radians, float x, float y, float z);
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeXRotation(float radians);
+static __inline__ GLKMatrix4 GLKMatrix4MakeYRotation(float radians);
+static __inline__ GLKMatrix4 GLKMatrix4MakeZRotation(float radians);
+
+/*
+ Equivalent to gluPerspective.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakePerspective(float fovyRadians, float aspect, float nearZ, float farZ);
+
+/*
+ Equivalent to glFrustum.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakeFrustum(float left, float right,
+                                                   float bottom, float top,
+                                                   float nearZ, float farZ);
+
+/*
+ Equivalent to glOrtho.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakeOrtho(float left, float right,
+                                                 float bottom, float top,
+                                                 float nearZ, float farZ);
+
+/*
+ Equivalent to gluLookAt.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4MakeLookAt(float eyeX, float eyeY, float eyeZ,
+                                                  float centerX, float centerY, float centerZ,
+                                                  float upX, float upY, float upZ);
+
+/*
+ Returns the upper left 3x3 portion of the 4x4 matrix.
+ */
+static __inline__ GLKMatrix3 GLKMatrix4GetMatrix3(GLKMatrix4 matrix);
+/*
+ Returns the upper left 2x2 portion of the 4x4 matrix.
+ */
+static __inline__ GLKMatrix2 GLKMatrix4GetMatrix2(GLKMatrix4 matrix);
+
+/*
+ GLKMatrix4GetRow returns vectors for rows 0, 1, and 2 whose last component will be the translation value tx, ty, and tz, respectively.
+ Valid row values range from 0 to 3, inclusive.
+ */
+static __inline__ GLKVector4 GLKMatrix4GetRow(GLKMatrix4 matrix, int row);
+/*
+ GLKMatrix4GetColumn returns a vector for column 3 whose first three components will be the translation values tx, ty, and tz.
+ Valid column values range from 0 to 3, inclusive.
+ */
+static __inline__ GLKVector4 GLKMatrix4GetColumn(GLKMatrix4 matrix, int column);
+
+/*
+ GLKMatrix4SetRow expects that the vector for row 0, 1, and 2 will have a translation value as its last component.
+ Valid row values range from 0 to 3, inclusive.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4SetRow(GLKMatrix4 matrix, int row, GLKVector4 vector);
+/*
+ GLKMatrix4SetColumn expects that the vector for column 3 will contain the translation values tx, ty, and tz as its first three components, respectively.
+ Valid column values range from 0 to 3, inclusive.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4SetColumn(GLKMatrix4 matrix, int column, GLKVector4 vector);
+
+static __inline__ GLKMatrix4 GLKMatrix4Transpose(GLKMatrix4 matrix);
+
+GLKMatrix4 GLKMatrix4Invert(GLKMatrix4 matrix, bool *isInvertible);
+GLKMatrix4 GLKMatrix4InvertAndTranspose(GLKMatrix4 matrix, bool *isInvertible);
+
+static __inline__ GLKMatrix4 GLKMatrix4Multiply(GLKMatrix4 matrixLeft, GLKMatrix4 matrixRight);
+
+static __inline__ GLKMatrix4 GLKMatrix4Add(GLKMatrix4 matrixLeft, GLKMatrix4 matrixRight);
+static __inline__ GLKMatrix4 GLKMatrix4Subtract(GLKMatrix4 matrixLeft, GLKMatrix4 matrixRight);
+
+static __inline__ GLKMatrix4 GLKMatrix4Translate(GLKMatrix4 matrix, float tx, float ty, float tz);
+static __inline__ GLKMatrix4 GLKMatrix4TranslateWithVector3(GLKMatrix4 matrix, GLKVector3 translationVector);
+/*
+ The last component of the GLKVector4, translationVector, is ignored.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4TranslateWithVector4(GLKMatrix4 matrix, GLKVector4 translationVector);
+
+static __inline__ GLKMatrix4 GLKMatrix4Scale(GLKMatrix4 matrix, float sx, float sy, float sz);
+static __inline__ GLKMatrix4 GLKMatrix4ScaleWithVector3(GLKMatrix4 matrix, GLKVector3 scaleVector);
+/*
+ The last component of the GLKVector4, scaleVector, is ignored.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4ScaleWithVector4(GLKMatrix4 matrix, GLKVector4 scaleVector);
+
+static __inline__ GLKMatrix4 GLKMatrix4Rotate(GLKMatrix4 matrix, float radians, float x, float y, float z);
+static __inline__ GLKMatrix4 GLKMatrix4RotateWithVector3(GLKMatrix4 matrix, float radians, GLKVector3 axisVector);
+/*
+ The last component of the GLKVector4, axisVector, is ignored.
+ */
+static __inline__ GLKMatrix4 GLKMatrix4RotateWithVector4(GLKMatrix4 matrix, float radians, GLKVector4 axisVector);
+
+static __inline__ GLKMatrix4 GLKMatrix4RotateX(GLKMatrix4 matrix, float radians);
+static __inline__ GLKMatrix4 GLKMatrix4RotateY(GLKMatrix4 matrix, float radians);
+static __inline__ GLKMatrix4 GLKMatrix4RotateZ(GLKMatrix4 matrix, float radians);
+
+/*
+ Assumes 0 in the w component.
+ */
+static __inline__ GLKVector3 GLKMatrix4MultiplyVector3(GLKMatrix4 matrixLeft, GLKVector3 vectorRight);
+/*
+ Assumes 1 in the w component.
+ */
+static __inline__ GLKVector3 GLKMatrix4MultiplyVector3WithTranslation(GLKMatrix4 matrixLeft, GLKVector3 vectorRight);
+/*
+ Assumes 1 in the w component and divides the resulting vector by w before returning.
+ */
+static __inline__ GLKVector3 GLKMatrix4MultiplyAndProjectVector3(GLKMatrix4 matrixLeft, GLKVector3 vectorRight);
+
+/*
+ Assumes 0 in the w component.
+ */
+static __inline__ void GLKMatrix4MultiplyVector3Array(GLKMatrix4 matrix, GLKVector3 *vectors, size_t vectorCount);
+/*
+ Assumes 1 in the w component.
+ */
+static __inline__ void GLKMatrix4MultiplyVector3ArrayWithTranslation(GLKMatrix4 matrix, GLKVector3 *vectors, size_t vectorCount);
+/*
+ Assumes 1 in the w component and divides the resulting vector by w before returning.
+ */
+static __inline__ void GLKMatrix4MultiplyAndProjectVector3Array(GLKMatrix4 matrix, GLKVector3 *vectors, size_t vectorCount);
+
+static __inline__ GLKVector4 GLKMatrix4MultiplyVector4(GLKMatrix4 matrixLeft, GLKVector4 vectorRight);
+
+static __inline__ void GLKMatrix4MultiplyVector4Array(GLKMatrix4 matrix, GLKVector4 *vectors, size_t vectorCount);
+
+#pragma mark -
+#pragma mark Implementations
+#pragma mark -
+
+static __inline__ GLKMatrix4 GLKMatrix4Make(float m00, float m01, float m02, float m03,
+                                            float m10, float m11, float m12, float m13,
+                                            float m20, float m21, float m22, float m23,
+                                            float m30, float m31, float m32, float m33)
+{
+    GLKMatrix4 m = { m00, m01, m02, m03,
+                     m10, m11, m12, m13,
+                     m20, m21, m22, m23,
+                     m30, m31, m32, m33 };
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeAndTranspose(float m00, float m01, float m02, float m03,
+                                                        float m10, float m11, float m12, float m13,
+                                                        float m20, float m21, float m22, float m23,
+                                                        float m30, float m31, float m32, float m33)
+{
+    GLKMatrix4 m = { m00, m10, m20, m30,
+                     m01, m11, m21, m31,
+                     m02, m12, m22, m32,
+                     m03, m13, m23, m33 };
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithArray(float values[16])
+{
+    GLKMatrix4 m = { values[0], values[1], values[2], values[3],
+                     values[4], values[5], values[6], values[7],
+                     values[8], values[9], values[10], values[11],
+                     values[12], values[13], values[14], values[15] };
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithArrayAndTranspose(float values[16])
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t m = vld4q_f32(values);
+    return *(GLKMatrix4 *)&m;
+#else
+    GLKMatrix4 m = { values[0], values[4], values[8], values[12],
+                     values[1], values[5], values[9], values[13],
+                     values[2], values[6], values[10], values[14],
+                     values[3], values[7], values[11], values[15] };
+    return m;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithRows(GLKVector4 row0,
+                                                    GLKVector4 row1,
+                                                    GLKVector4 row2,
+                                                    GLKVector4 row3)
+{
+    GLKMatrix4 m = { row0.v[0], row1.v[0], row2.v[0], row3.v[0],
+                     row0.v[1], row1.v[1], row2.v[1], row3.v[1],
+                     row0.v[2], row1.v[2], row2.v[2], row3.v[2],
+                     row0.v[3], row1.v[3], row2.v[3], row3.v[3] };
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithColumns(GLKVector4 column0,
+                                                       GLKVector4 column1,
+                                                       GLKVector4 column2,
+                                                       GLKVector4 column3)
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t m;
+    m.val[0] = vld1q_f32(column0.v);
+    m.val[1] = vld1q_f32(column1.v);
+    m.val[2] = vld1q_f32(column2.v);
+    m.val[3] = vld1q_f32(column3.v);
+    return *(GLKMatrix4 *)&m;
+#else
+    GLKMatrix4 m = { column0.v[0], column0.v[1], column0.v[2], column0.v[3],
+                     column1.v[0], column1.v[1], column1.v[2], column1.v[3],
+                     column2.v[0], column2.v[1], column2.v[2], column2.v[3],
+                     column3.v[0], column3.v[1], column3.v[2], column3.v[3] };
+    return m;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeWithQuaternion(GLKQuaternion quaternion)
+{
+    quaternion = GLKQuaternionNormalize(quaternion);
+
+    float x = quaternion.q[0];
+    float y = quaternion.q[1];
+    float z = quaternion.q[2];
+    float w = quaternion.q[3];
+
+    float _2x = x + x;
+    float _2y = y + y;
+    float _2z = z + z;
+    float _2w = w + w;
+
+    GLKMatrix4 m = { 1.0f - _2y * y - _2z * z,
+                     _2x * y + _2w * z,
+                     _2x * z - _2w * y,
+                     0.0f,
+                     _2x * y - _2w * z,
+                     1.0f - _2x * x - _2z * z,
+                     _2y * z + _2w * x,
+                     0.0f,
+                     _2x * z + _2w * y,
+                     _2y * z - _2w * x,
+                     1.0f - _2x * x - _2y * y,
+                     0.0f,
+                     0.0f,
+                     0.0f,
+                     0.0f,
+                     1.0f };
+
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeTranslation(float tx, float ty, float tz)
+{
+    GLKMatrix4 m = GLKMatrix4Identity;
+    m.m[12] = tx;
+    m.m[13] = ty;
+    m.m[14] = tz;
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeScale(float sx, float sy, float sz)
+{
+    GLKMatrix4 m = GLKMatrix4Identity;
+    m.m[0] = sx;
+    m.m[5] = sy;
+    m.m[10] = sz;
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeRotation(float radians, float x, float y, float z)
+{
+    GLKVector3 v = GLKVector3Normalize(GLKVector3Make(x, y, z));
+    float cos = cosf(radians);
+    float cosp = 1.0f - cos;
+    float sin = sinf(radians);
+
+    GLKMatrix4 m = { cos + cosp * v.v[0] * v.v[0],
+                     cosp * v.v[0] * v.v[1] + v.v[2] * sin,
+                     cosp * v.v[0] * v.v[2] - v.v[1] * sin,
+                     0.0f,
+                     cosp * v.v[0] * v.v[1] - v.v[2] * sin,
+                     cos + cosp * v.v[1] * v.v[1],
+                     cosp * v.v[1] * v.v[2] + v.v[0] * sin,
+                     0.0f,
+                     cosp * v.v[0] * v.v[2] + v.v[1] * sin,
+                     cosp * v.v[1] * v.v[2] - v.v[0] * sin,
+                     cos + cosp * v.v[2] * v.v[2],
+                     0.0f,
+                     0.0f,
+                     0.0f,
+                     0.0f,
+                     1.0f };
+
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeXRotation(float radians)
+{
+    float cos = cosf(radians);
+    float sin = sinf(radians);
+
+    GLKMatrix4 m = { 1.0f, 0.0f, 0.0f, 0.0f,
+                     0.0f, cos, sin, 0.0f,
+                     0.0f, -sin, cos, 0.0f,
+                     0.0f, 0.0f, 0.0f, 1.0f };
+
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeYRotation(float radians)
+{
+    float cos = cosf(radians);
+    float sin = sinf(radians);
+
+    GLKMatrix4 m = { cos, 0.0f, -sin, 0.0f,
+                     0.0f, 1.0f, 0.0f, 0.0f,
+                     sin, 0.0f, cos, 0.0f,
+                     0.0f, 0.0f, 0.0f, 1.0f };
+
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeZRotation(float radians)
+{
+    float cos = cosf(radians);
+    float sin = sinf(radians);
+
+    GLKMatrix4 m = { cos, sin, 0.0f, 0.0f,
+                     -sin, cos, 0.0f, 0.0f,
+                     0.0f, 0.0f, 1.0f, 0.0f,
+                     0.0f, 0.0f, 0.0f, 1.0f };
+
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakePerspective(float fovyRadians, float aspect, float nearZ, float farZ)
+{
+    float cotan = 1.0f / tanf(fovyRadians / 2.0f);
+
+    GLKMatrix4 m = { cotan / aspect, 0.0f, 0.0f, 0.0f,
+                     0.0f, cotan, 0.0f, 0.0f,
+                     0.0f, 0.0f, (farZ + nearZ) / (nearZ - farZ), -1.0f,
+                     0.0f, 0.0f, (2.0f * farZ * nearZ) / (nearZ - farZ), 0.0f };
+
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeFrustum(float left, float right,
+                                                   float bottom, float top,
+                                                   float nearZ, float farZ)
+{
+    float ral = right + left;
+    float rsl = right - left;
+    float tsb = top - bottom;
+    float tab = top + bottom;
+    float fan = farZ + nearZ;
+    float fsn = farZ - nearZ;
+
+    GLKMatrix4 m = { 2.0f * nearZ / rsl, 0.0f, 0.0f, 0.0f,
+                     0.0f, 2.0f * nearZ / tsb, 0.0f, 0.0f,
+                     ral / rsl, tab / tsb, -fan / fsn, -1.0f,
+                     0.0f, 0.0f, (-2.0f * farZ * nearZ) / fsn, 0.0f };
+
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeOrtho(float left, float right,
+                                                 float bottom, float top,
+                                                 float nearZ, float farZ)
+{
+    float ral = right + left;
+    float rsl = right - left;
+    float tab = top + bottom;
+    float tsb = top - bottom;
+    float fan = farZ + nearZ;
+    float fsn = farZ - nearZ;
+
+    GLKMatrix4 m = { 2.0f / rsl, 0.0f, 0.0f, 0.0f,
+                     0.0f, 2.0f / tsb, 0.0f, 0.0f,
+                     0.0f, 0.0f, -2.0f / fsn, 0.0f,
+                     -ral / rsl, -tab / tsb, -fan / fsn, 1.0f };
+
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4MakeLookAt(float eyeX, float eyeY, float eyeZ,
+                                                  float centerX, float centerY, float centerZ,
+                                                  float upX, float upY, float upZ)
+{
+    GLKVector3 ev = { eyeX, eyeY, eyeZ };
+    GLKVector3 cv = { centerX, centerY, centerZ };
+    GLKVector3 uv = { upX, upY, upZ };
+    GLKVector3 n = GLKVector3Normalize(GLKVector3Add(ev, GLKVector3Negate(cv)));
+    GLKVector3 u = GLKVector3Normalize(GLKVector3CrossProduct(uv, n));
+    GLKVector3 v = GLKVector3CrossProduct(n, u);
+
+    GLKMatrix4 m = { u.v[0], v.v[0], n.v[0], 0.0f,
+                     u.v[1], v.v[1], n.v[1], 0.0f,
+                     u.v[2], v.v[2], n.v[2], 0.0f,
+                     GLKVector3DotProduct(GLKVector3Negate(u), ev),
+                     GLKVector3DotProduct(GLKVector3Negate(v), ev),
+                     GLKVector3DotProduct(GLKVector3Negate(n), ev),
+                     1.0f };
+
+    return m;
+}
+
+static __inline__ GLKMatrix3 GLKMatrix4GetMatrix3(GLKMatrix4 matrix)
+{
+    GLKMatrix3 m = { matrix.m[0], matrix.m[1], matrix.m[2],
+                     matrix.m[4], matrix.m[5], matrix.m[6],
+                     matrix.m[8], matrix.m[9], matrix.m[10] };
+    return m;
+}
+
+static __inline__ GLKMatrix2 GLKMatrix4GetMatrix2(GLKMatrix4 matrix)
+{
+    GLKMatrix2 m = { matrix.m[0], matrix.m[1],
+                     matrix.m[4], matrix.m[5] };
+    return m;
+}
+
+static __inline__ GLKVector4 GLKMatrix4GetRow(GLKMatrix4 matrix, int row)
+{
+    GLKVector4 v = { matrix.m[row], matrix.m[4 + row], matrix.m[8 + row], matrix.m[12 + row] };
+    return v;
+}
+
+static __inline__ GLKVector4 GLKMatrix4GetColumn(GLKMatrix4 matrix, int column)
+{
+#if defined(__ARM_NEON__)
+    float32x4_t v = vld1q_f32(&(matrix.m[column * 4]));
+    return *(GLKVector4 *)&v;
+#else
+    GLKVector4 v = { matrix.m[column * 4 + 0], matrix.m[column * 4 + 1], matrix.m[column * 4 + 2], matrix.m[column * 4 + 3] };
+    return v;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4SetRow(GLKMatrix4 matrix, int row, GLKVector4 vector)
+{
+    matrix.m[row] = vector.v[0];
+    matrix.m[row + 4] = vector.v[1];
+    matrix.m[row + 8] = vector.v[2];
+    matrix.m[row + 12] = vector.v[3];
+
+    return matrix;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4SetColumn(GLKMatrix4 matrix, int column, GLKVector4 vector)
+{
+#if defined(__ARM_NEON__)
+    float *dst = &(matrix.m[column * 4]);
+    vst1q_f32(dst, vld1q_f32(vector.v));
+    return matrix;
+#else
+    matrix.m[column * 4 + 0] = vector.v[0];
+    matrix.m[column * 4 + 1] = vector.v[1];
+    matrix.m[column * 4 + 2] = vector.v[2];
+    matrix.m[column * 4 + 3] = vector.v[3];
+
+    return matrix;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4Transpose(GLKMatrix4 matrix)
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t m = vld4q_f32(matrix.m);
+    return *(GLKMatrix4 *)&m;
+#else
+    GLKMatrix4 m = { matrix.m[0], matrix.m[4], matrix.m[8], matrix.m[12],
+                     matrix.m[1], matrix.m[5], matrix.m[9], matrix.m[13],
+                     matrix.m[2], matrix.m[6], matrix.m[10], matrix.m[14],
+                     matrix.m[3], matrix.m[7], matrix.m[11], matrix.m[15] };
+    return m;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4Multiply(GLKMatrix4 matrixLeft, GLKMatrix4 matrixRight)
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t iMatrixLeft = *(float32x4x4_t *)&matrixLeft;
+    float32x4x4_t iMatrixRight = *(float32x4x4_t *)&matrixRight;
+    float32x4x4_t m;
+
+    m.val[0] = vmulq_n_f32(iMatrixLeft.val[0], vgetq_lane_f32(iMatrixRight.val[0], 0));
+    m.val[1] = vmulq_n_f32(iMatrixLeft.val[0], vgetq_lane_f32(iMatrixRight.val[1], 0));
+    m.val[2] = vmulq_n_f32(iMatrixLeft.val[0], vgetq_lane_f32(iMatrixRight.val[2], 0));
+    m.val[3] = vmulq_n_f32(iMatrixLeft.val[0], vgetq_lane_f32(iMatrixRight.val[3], 0));
+
+    m.val[0] = vmlaq_n_f32(m.val[0], iMatrixLeft.val[1], vgetq_lane_f32(iMatrixRight.val[0], 1));
+    m.val[1] = vmlaq_n_f32(m.val[1], iMatrixLeft.val[1], vgetq_lane_f32(iMatrixRight.val[1], 1));
+    m.val[2] = vmlaq_n_f32(m.val[2], iMatrixLeft.val[1], vgetq_lane_f32(iMatrixRight.val[2], 1));
+    m.val[3] = vmlaq_n_f32(m.val[3], iMatrixLeft.val[1], vgetq_lane_f32(iMatrixRight.val[3], 1));
+
+    m.val[0] = vmlaq_n_f32(m.val[0], iMatrixLeft.val[2], vgetq_lane_f32(iMatrixRight.val[0], 2));
+    m.val[1] = vmlaq_n_f32(m.val[1], iMatrixLeft.val[2], vgetq_lane_f32(iMatrixRight.val[1], 2));
+    m.val[2] = vmlaq_n_f32(m.val[2], iMatrixLeft.val[2], vgetq_lane_f32(iMatrixRight.val[2], 2));
+    m.val[3] = vmlaq_n_f32(m.val[3], iMatrixLeft.val[2], vgetq_lane_f32(iMatrixRight.val[3], 2));
+
+    m.val[0] = vmlaq_n_f32(m.val[0], iMatrixLeft.val[3], vgetq_lane_f32(iMatrixRight.val[0], 3));
+    m.val[1] = vmlaq_n_f32(m.val[1], iMatrixLeft.val[3], vgetq_lane_f32(iMatrixRight.val[1], 3));
+    m.val[2] = vmlaq_n_f32(m.val[2], iMatrixLeft.val[3], vgetq_lane_f32(iMatrixRight.val[2], 3));
+    m.val[3] = vmlaq_n_f32(m.val[3], iMatrixLeft.val[3], vgetq_lane_f32(iMatrixRight.val[3], 3));
+
+    return *(GLKMatrix4 *)&m;
+#else
+    GLKMatrix4 m;
+
+    m.m[0]  = matrixLeft.m[0] * matrixRight.m[0]  + matrixLeft.m[4] * matrixRight.m[1]  + matrixLeft.m[8] * matrixRight.m[2]   + matrixLeft.m[12] * matrixRight.m[3];
+	m.m[4]  = matrixLeft.m[0] * matrixRight.m[4]  + matrixLeft.m[4] * matrixRight.m[5]  + matrixLeft.m[8] * matrixRight.m[6]   + matrixLeft.m[12] * matrixRight.m[7];
+	m.m[8]  = matrixLeft.m[0] * matrixRight.m[8]  + matrixLeft.m[4] * matrixRight.m[9]  + matrixLeft.m[8] * matrixRight.m[10]  + matrixLeft.m[12] * matrixRight.m[11];
+	m.m[12] = matrixLeft.m[0] * matrixRight.m[12] + matrixLeft.m[4] * matrixRight.m[13] + matrixLeft.m[8] * matrixRight.m[14]  + matrixLeft.m[12] * matrixRight.m[15];
+
+	m.m[1]  = matrixLeft.m[1] * matrixRight.m[0]  + matrixLeft.m[5] * matrixRight.m[1]  + matrixLeft.m[9] * matrixRight.m[2]   + matrixLeft.m[13] * matrixRight.m[3];
+	m.m[5]  = matrixLeft.m[1] * matrixRight.m[4]  + matrixLeft.m[5] * matrixRight.m[5]  + matrixLeft.m[9] * matrixRight.m[6]   + matrixLeft.m[13] * matrixRight.m[7];
+	m.m[9]  = matrixLeft.m[1] * matrixRight.m[8]  + matrixLeft.m[5] * matrixRight.m[9]  + matrixLeft.m[9] * matrixRight.m[10]  + matrixLeft.m[13] * matrixRight.m[11];
+	m.m[13] = matrixLeft.m[1] * matrixRight.m[12] + matrixLeft.m[5] * matrixRight.m[13] + matrixLeft.m[9] * matrixRight.m[14]  + matrixLeft.m[13] * matrixRight.m[15];
+
+	m.m[2]  = matrixLeft.m[2] * matrixRight.m[0]  + matrixLeft.m[6] * matrixRight.m[1]  + matrixLeft.m[10] * matrixRight.m[2]  + matrixLeft.m[14] * matrixRight.m[3];
+	m.m[6]  = matrixLeft.m[2] * matrixRight.m[4]  + matrixLeft.m[6] * matrixRight.m[5]  + matrixLeft.m[10] * matrixRight.m[6]  + matrixLeft.m[14] * matrixRight.m[7];
+	m.m[10] = matrixLeft.m[2] * matrixRight.m[8]  + matrixLeft.m[6] * matrixRight.m[9]  + matrixLeft.m[10] * matrixRight.m[10] + matrixLeft.m[14] * matrixRight.m[11];
+	m.m[14] = matrixLeft.m[2] * matrixRight.m[12] + matrixLeft.m[6] * matrixRight.m[13] + matrixLeft.m[10] * matrixRight.m[14] + matrixLeft.m[14] * matrixRight.m[15];
+
+	m.m[3]  = matrixLeft.m[3] * matrixRight.m[0]  + matrixLeft.m[7] * matrixRight.m[1]  + matrixLeft.m[11] * matrixRight.m[2]  + matrixLeft.m[15] * matrixRight.m[3];
+	m.m[7]  = matrixLeft.m[3] * matrixRight.m[4]  + matrixLeft.m[7] * matrixRight.m[5]  + matrixLeft.m[11] * matrixRight.m[6]  + matrixLeft.m[15] * matrixRight.m[7];
+	m.m[11] = matrixLeft.m[3] * matrixRight.m[8]  + matrixLeft.m[7] * matrixRight.m[9]  + matrixLeft.m[11] * matrixRight.m[10] + matrixLeft.m[15] * matrixRight.m[11];
+	m.m[15] = matrixLeft.m[3] * matrixRight.m[12] + matrixLeft.m[7] * matrixRight.m[13] + matrixLeft.m[11] * matrixRight.m[14] + matrixLeft.m[15] * matrixRight.m[15];
+
+    return m;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4Add(GLKMatrix4 matrixLeft, GLKMatrix4 matrixRight)
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t iMatrixLeft = *(float32x4x4_t *)&matrixLeft;
+    float32x4x4_t iMatrixRight = *(float32x4x4_t *)&matrixRight;
+    float32x4x4_t m;
+
+    m.val[0] = vaddq_f32(iMatrixLeft.val[0], iMatrixRight.val[0]);
+    m.val[1] = vaddq_f32(iMatrixLeft.val[1], iMatrixRight.val[1]);
+    m.val[2] = vaddq_f32(iMatrixLeft.val[2], iMatrixRight.val[2]);
+    m.val[3] = vaddq_f32(iMatrixLeft.val[3], iMatrixRight.val[3]);
+
+    return *(GLKMatrix4 *)&m;
+#else
+    GLKMatrix4 m;
+
+    m.m[0] = matrixLeft.m[0] + matrixRight.m[0];
+    m.m[1] = matrixLeft.m[1] + matrixRight.m[1];
+    m.m[2] = matrixLeft.m[2] + matrixRight.m[2];
+    m.m[3] = matrixLeft.m[3] + matrixRight.m[3];
+
+    m.m[4] = matrixLeft.m[4] + matrixRight.m[4];
+    m.m[5] = matrixLeft.m[5] + matrixRight.m[5];
+    m.m[6] = matrixLeft.m[6] + matrixRight.m[6];
+    m.m[7] = matrixLeft.m[7] + matrixRight.m[7];
+
+    m.m[8] = matrixLeft.m[8] + matrixRight.m[8];
+    m.m[9] = matrixLeft.m[9] + matrixRight.m[9];
+    m.m[10] = matrixLeft.m[10] + matrixRight.m[10];
+    m.m[11] = matrixLeft.m[11] + matrixRight.m[11];
+
+    m.m[12] = matrixLeft.m[12] + matrixRight.m[12];
+    m.m[13] = matrixLeft.m[13] + matrixRight.m[13];
+    m.m[14] = matrixLeft.m[14] + matrixRight.m[14];
+    m.m[15] = matrixLeft.m[15] + matrixRight.m[15];
+
+    return m;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4Subtract(GLKMatrix4 matrixLeft, GLKMatrix4 matrixRight)
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t iMatrixLeft = *(float32x4x4_t *)&matrixLeft;
+    float32x4x4_t iMatrixRight = *(float32x4x4_t *)&matrixRight;
+    float32x4x4_t m;
+
+    m.val[0] = vsubq_f32(iMatrixLeft.val[0], iMatrixRight.val[0]);
+    m.val[1] = vsubq_f32(iMatrixLeft.val[1], iMatrixRight.val[1]);
+    m.val[2] = vsubq_f32(iMatrixLeft.val[2], iMatrixRight.val[2]);
+    m.val[3] = vsubq_f32(iMatrixLeft.val[3], iMatrixRight.val[3]);
+
+    return *(GLKMatrix4 *)&m;
+#else
+    GLKMatrix4 m;
+
+    m.m[0] = matrixLeft.m[0] - matrixRight.m[0];
+    m.m[1] = matrixLeft.m[1] - matrixRight.m[1];
+    m.m[2] = matrixLeft.m[2] - matrixRight.m[2];
+    m.m[3] = matrixLeft.m[3] - matrixRight.m[3];
+
+    m.m[4] = matrixLeft.m[4] - matrixRight.m[4];
+    m.m[5] = matrixLeft.m[5] - matrixRight.m[5];
+    m.m[6] = matrixLeft.m[6] - matrixRight.m[6];
+    m.m[7] = matrixLeft.m[7] - matrixRight.m[7];
+
+    m.m[8] = matrixLeft.m[8] - matrixRight.m[8];
+    m.m[9] = matrixLeft.m[9] - matrixRight.m[9];
+    m.m[10] = matrixLeft.m[10] - matrixRight.m[10];
+    m.m[11] = matrixLeft.m[11] - matrixRight.m[11];
+
+    m.m[12] = matrixLeft.m[12] - matrixRight.m[12];
+    m.m[13] = matrixLeft.m[13] - matrixRight.m[13];
+    m.m[14] = matrixLeft.m[14] - matrixRight.m[14];
+    m.m[15] = matrixLeft.m[15] - matrixRight.m[15];
+
+    return m;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4Translate(GLKMatrix4 matrix, float tx, float ty, float tz)
+{
+    GLKMatrix4 m = { matrix.m[0], matrix.m[1], matrix.m[2], matrix.m[3],
+                     matrix.m[4], matrix.m[5], matrix.m[6], matrix.m[7],
+                     matrix.m[8], matrix.m[9], matrix.m[10], matrix.m[11],
+                     matrix.m[0] * tx + matrix.m[4] * ty + matrix.m[8] * tz + matrix.m[12],
+                     matrix.m[1] * tx + matrix.m[5] * ty + matrix.m[9] * tz + matrix.m[13],
+                     matrix.m[2] * tx + matrix.m[6] * ty + matrix.m[10] * tz + matrix.m[14],
+                     matrix.m[15] };
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4TranslateWithVector3(GLKMatrix4 matrix, GLKVector3 translationVector)
+{
+    GLKMatrix4 m = { matrix.m[0], matrix.m[1], matrix.m[2], matrix.m[3],
+                     matrix.m[4], matrix.m[5], matrix.m[6], matrix.m[7],
+                     matrix.m[8], matrix.m[9], matrix.m[10], matrix.m[11],
+                     matrix.m[0] * translationVector.v[0] + matrix.m[4] * translationVector.v[1] + matrix.m[8] * translationVector.v[2] + matrix.m[12],
+                     matrix.m[1] * translationVector.v[0] + matrix.m[5] * translationVector.v[1] + matrix.m[9] * translationVector.v[2] + matrix.m[13],
+                     matrix.m[2] * translationVector.v[0] + matrix.m[6] * translationVector.v[1] + matrix.m[10] * translationVector.v[2] + matrix.m[14],
+                     matrix.m[15] };
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4TranslateWithVector4(GLKMatrix4 matrix, GLKVector4 translationVector)
+{
+    GLKMatrix4 m = { matrix.m[0], matrix.m[1], matrix.m[2], matrix.m[3],
+                     matrix.m[4], matrix.m[5], matrix.m[6], matrix.m[7],
+                     matrix.m[8], matrix.m[9], matrix.m[10], matrix.m[11],
+                     matrix.m[0] * translationVector.v[0] + matrix.m[4] * translationVector.v[1] + matrix.m[8] * translationVector.v[2] + matrix.m[12],
+                     matrix.m[1] * translationVector.v[0] + matrix.m[5] * translationVector.v[1] + matrix.m[9] * translationVector.v[2] + matrix.m[13],
+                     matrix.m[2] * translationVector.v[0] + matrix.m[6] * translationVector.v[1] + matrix.m[10] * translationVector.v[2] + matrix.m[14],
+                     matrix.m[15] };
+    return m;
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4Scale(GLKMatrix4 matrix, float sx, float sy, float sz)
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t iMatrix = *(float32x4x4_t *)&matrix;
+    float32x4x4_t m;
+
+    m.val[0] = vmulq_n_f32(iMatrix.val[0], (float32_t)sx);
+    m.val[1] = vmulq_n_f32(iMatrix.val[1], (float32_t)sy);
+    m.val[2] = vmulq_n_f32(iMatrix.val[2], (float32_t)sz);
+    m.val[3] = iMatrix.val[3];
+
+    return *(GLKMatrix4 *)&m;
+#else
+    GLKMatrix4 m = { matrix.m[0] * sx, matrix.m[1] * sx, matrix.m[2] * sx, matrix.m[3] * sx,
+                     matrix.m[4] * sy, matrix.m[5] * sy, matrix.m[6] * sy, matrix.m[7] * sy,
+                     matrix.m[8] * sz, matrix.m[9] * sz, matrix.m[10] * sz, matrix.m[11] * sz,
+                     matrix.m[12], matrix.m[13], matrix.m[14], matrix.m[15] };
+    return m;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4ScaleWithVector3(GLKMatrix4 matrix, GLKVector3 scaleVector)
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t iMatrix = *(float32x4x4_t *)&matrix;
+    float32x4x4_t m;
+
+    m.val[0] = vmulq_n_f32(iMatrix.val[0], (float32_t)scaleVector.v[0]);
+    m.val[1] = vmulq_n_f32(iMatrix.val[1], (float32_t)scaleVector.v[1]);
+    m.val[2] = vmulq_n_f32(iMatrix.val[2], (float32_t)scaleVector.v[2]);
+    m.val[3] = iMatrix.val[3];
+
+    return *(GLKMatrix4 *)&m;
+#else
+    GLKMatrix4 m = { matrix.m[0] * scaleVector.v[0], matrix.m[1] * scaleVector.v[0], matrix.m[2] * scaleVector.v[0], matrix.m[3] * scaleVector.v[0],
+                     matrix.m[4] * scaleVector.v[1], matrix.m[5] * scaleVector.v[1], matrix.m[6] * scaleVector.v[1], matrix.m[7] * scaleVector.v[1],
+                     matrix.m[8] * scaleVector.v[2], matrix.m[9] * scaleVector.v[2], matrix.m[10] * scaleVector.v[2], matrix.m[11] * scaleVector.v[2],
+                     matrix.m[12], matrix.m[13], matrix.m[14], matrix.m[15] };
+    return m;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4ScaleWithVector4(GLKMatrix4 matrix, GLKVector4 scaleVector)
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t iMatrix = *(float32x4x4_t *)&matrix;
+    float32x4x4_t m;
+
+    m.val[0] = vmulq_n_f32(iMatrix.val[0], (float32_t)scaleVector.v[0]);
+    m.val[1] = vmulq_n_f32(iMatrix.val[1], (float32_t)scaleVector.v[1]);
+    m.val[2] = vmulq_n_f32(iMatrix.val[2], (float32_t)scaleVector.v[2]);
+    m.val[3] = iMatrix.val[3];
+
+    return *(GLKMatrix4 *)&m;
+#else
+    GLKMatrix4 m = { matrix.m[0] * scaleVector.v[0], matrix.m[1] * scaleVector.v[0], matrix.m[2] * scaleVector.v[0], matrix.m[3] * scaleVector.v[0],
+                     matrix.m[4] * scaleVector.v[1], matrix.m[5] * scaleVector.v[1], matrix.m[6] * scaleVector.v[1], matrix.m[7] * scaleVector.v[1],
+                     matrix.m[8] * scaleVector.v[2], matrix.m[9] * scaleVector.v[2], matrix.m[10] * scaleVector.v[2], matrix.m[11] * scaleVector.v[2],
+                     matrix.m[12], matrix.m[13], matrix.m[14], matrix.m[15] };
+    return m;
+#endif
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4Rotate(GLKMatrix4 matrix, float radians, float x, float y, float z)
+{
+    GLKMatrix4 rm = GLKMatrix4MakeRotation(radians, x, y, z);
+    return GLKMatrix4Multiply(matrix, rm);
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4RotateWithVector3(GLKMatrix4 matrix, float radians, GLKVector3 axisVector)
+{
+    GLKMatrix4 rm = GLKMatrix4MakeRotation(radians, axisVector.v[0], axisVector.v[1], axisVector.v[2]);
+    return GLKMatrix4Multiply(matrix, rm);
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4RotateWithVector4(GLKMatrix4 matrix, float radians, GLKVector4 axisVector)
+{
+    GLKMatrix4 rm = GLKMatrix4MakeRotation(radians, axisVector.v[0], axisVector.v[1], axisVector.v[2]);
+    return GLKMatrix4Multiply(matrix, rm);
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4RotateX(GLKMatrix4 matrix, float radians)
+{
+    GLKMatrix4 rm = GLKMatrix4MakeXRotation(radians);
+    return GLKMatrix4Multiply(matrix, rm);
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4RotateY(GLKMatrix4 matrix, float radians)
+{
+    GLKMatrix4 rm = GLKMatrix4MakeYRotation(radians);
+    return GLKMatrix4Multiply(matrix, rm);
+}
+
+static __inline__ GLKMatrix4 GLKMatrix4RotateZ(GLKMatrix4 matrix, float radians)
+{
+    GLKMatrix4 rm = GLKMatrix4MakeZRotation(radians);
+    return GLKMatrix4Multiply(matrix, rm);
+}
+
+static __inline__ GLKVector3 GLKMatrix4MultiplyVector3(GLKMatrix4 matrixLeft, GLKVector3 vectorRight)
+{
+    GLKVector4 v4 = GLKMatrix4MultiplyVector4(matrixLeft, GLKVector4Make(vectorRight.v[0], vectorRight.v[1], vectorRight.v[2], 0.0f));
+    return GLKVector3Make(v4.v[0], v4.v[1], v4.v[2]);
+}
+
+static __inline__ GLKVector3 GLKMatrix4MultiplyVector3WithTranslation(GLKMatrix4 matrixLeft, GLKVector3 vectorRight)
+{
+    GLKVector4 v4 = GLKMatrix4MultiplyVector4(matrixLeft, GLKVector4Make(vectorRight.v[0], vectorRight.v[1], vectorRight.v[2], 1.0f));
+    return GLKVector3Make(v4.v[0], v4.v[1], v4.v[2]);
+}
+
+static __inline__ GLKVector3 GLKMatrix4MultiplyAndProjectVector3(GLKMatrix4 matrixLeft, GLKVector3 vectorRight)
+{
+    GLKVector4 v4 = GLKMatrix4MultiplyVector4(matrixLeft, GLKVector4Make(vectorRight.v[0], vectorRight.v[1], vectorRight.v[2], 1.0f));
+    return GLKVector3MultiplyScalar(GLKVector3Make(v4.v[0], v4.v[1], v4.v[2]), 1.0f / v4.v[3]);
+}
+
+static __inline__ void GLKMatrix4MultiplyVector3Array(GLKMatrix4 matrix, GLKVector3 *vectors, size_t vectorCount)
+{
+    size_t i;
+    for (i=0; i < vectorCount; i++)
+        vectors[i] = GLKMatrix4MultiplyVector3(matrix, vectors[i]);
+}
+
+static __inline__ void GLKMatrix4MultiplyVector3ArrayWithTranslation(GLKMatrix4 matrix, GLKVector3 *vectors, size_t vectorCount)
+{
+    size_t i;
+    for (i=0; i < vectorCount; i++)
+        vectors[i] = GLKMatrix4MultiplyVector3WithTranslation(matrix, vectors[i]);
+}
+
+static __inline__ void GLKMatrix4MultiplyAndProjectVector3Array(GLKMatrix4 matrix, GLKVector3 *vectors, size_t vectorCount)
+{
+    size_t i;
+    for (i=0; i < vectorCount; i++)
+        vectors[i] = GLKMatrix4MultiplyAndProjectVector3(matrix, vectors[i]);
+}
+
+static __inline__ GLKVector4 GLKMatrix4MultiplyVector4(GLKMatrix4 matrixLeft, GLKVector4 vectorRight)
+{
+#if defined(__ARM_NEON__)
+    float32x4x4_t iMatrix = *(float32x4x4_t *)&matrixLeft;
+    float32x4_t v;
+
+    iMatrix.val[0] = vmulq_n_f32(iMatrix.val[0], (float32_t)vectorRight.v[0]);
+    iMatrix.val[1] = vmulq_n_f32(iMatrix.val[1], (float32_t)vectorRight.v[1]);
+    iMatrix.val[2] = vmulq_n_f32(iMatrix.val[2], (float32_t)vectorRight.v[2]);
+    iMatrix.val[3] = vmulq_n_f32(iMatrix.val[3], (float32_t)vectorRight.v[3]);
+
+    iMatrix.val[0] = vaddq_f32(iMatrix.val[0], iMatrix.val[1]);
+    iMatrix.val[2] = vaddq_f32(iMatrix.val[2], iMatrix.val[3]);
+
+    v = vaddq_f32(iMatrix.val[0], iMatrix.val[2]);
+
+    return *(GLKVector4 *)&v;
+#else
+    GLKVector4 v = { matrixLeft.m[0] * vectorRight.v[0] + matrixLeft.m[4] * vectorRight.v[1] + matrixLeft.m[8] * vectorRight.v[2] + matrixLeft.m[12] * vectorRight.v[3],
+                     matrixLeft.m[1] * vectorRight.v[0] + matrixLeft.m[5] * vectorRight.v[1] + matrixLeft.m[9] * vectorRight.v[2] + matrixLeft.m[13] * vectorRight.v[3],
+                     matrixLeft.m[2] * vectorRight.v[0] + matrixLeft.m[6] * vectorRight.v[1] + matrixLeft.m[10] * vectorRight.v[2] + matrixLeft.m[14] * vectorRight.v[3],
+                     matrixLeft.m[3] * vectorRight.v[0] + matrixLeft.m[7] * vectorRight.v[1] + matrixLeft.m[11] * vectorRight.v[2] + matrixLeft.m[15] * vectorRight.v[3] };
+    return v;
+#endif
+}
+
+static __inline__ void GLKMatrix4MultiplyVector4Array(GLKMatrix4 matrix, GLKVector4 *vectors, size_t vectorCount)
+{
+    size_t i;
+    for (i=0; i < vectorCount; i++)
+        vectors[i] = GLKMatrix4MultiplyVector4(matrix, vectors[i]);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __GLK_MATRIX_4_H */
--- a/samples/C/NWMan.h
+++ b/samples/C/NWMan.h
@@ -0,0 +1,99 @@
+#ifndef _NME_WMAN_H
+#define _NME_WMAN_H
+
+// Internal window manager API
+
+#include "NCompat.h"
+
+START_HEAD
+
+#include "NPos.h"
+#include "NUtil.h"
+#include "NTypes.h"
+
+NTS(NWMan_event);
+
+NSTRUCT(NWMan, {
+    // Init stuff
+    bool (*init)();
+    bool (*destroy)();
+
+    // Window stuff
+    bool (*create_window)();
+    bool (*destroy_window)();
+
+    void (*swap_buffers)();
+
+    // Event stuff
+    bool (*next_event)(NWMan_event* event);
+
+    // Time stuff
+    uint (*get_millis)();
+    void (*sleep)(uint millis);
+
+    // Info
+    int rshift_key;
+    int lshift_key;
+    int left_key;
+    int right_key;
+});
+
+NENUM(NWMan_event_type, {
+    N_WMAN_MOUSE_MOVE = 0,
+    N_WMAN_MOUSE_BUTTON = 1,
+    N_WMAN_MOUSE_WHEEL = 2,
+
+    N_WMAN_KEYBOARD = 10,
+
+    N_WMAN_QUIT = 20,
+    N_WMAN_RESIZE = 21,
+    N_WMAN_FOCUS = 22
+});
+
+#define N_WMAN_MOUSE_LEFT 0
+#define N_WMAN_MOUSE_RIGHT 1
+#define N_WMAN_MOUSE_MIDDLE 2
+
+NSTRUCT(NWMan_event, {
+    NWMan_event_type type;
+
+    union {
+        // Mouse
+
+        NPos2i mouse_pos;
+
+        struct {
+            short id;
+            bool state;
+        } mouse_button;
+
+        signed char mouse_wheel; // 1 if up, -1 if down
+
+        // Keyboard
+
+        struct {
+            int key;
+            bool state;
+        } keyboard;
+
+        // Window
+
+        bool window_quit; // Will always be true if WM_QUIT
+
+        NPos2i window_size;
+
+        bool window_focus;
+    };
+});
+
+NWMan_event NWMan_event_new(NWMan_event_type type);
+
+
+bool NWMan_init();
+bool NWMan_destroy();
+
+extern NWMan N_WMan;
+
+END_HEAD
+
+#endif
--- a/samples/C/Nightmare.h
+++ b/samples/C/Nightmare.h
@@ -0,0 +1,27 @@
+#ifndef _NMEX_NIGHTMARE_H
+#define _NMEX_NIGHTMARE_H
+
+//#define NMEX
+
+#include "../src/NCompat.h"
+
+START_HEAD
+
+#include "../src/NTypes.h"
+#include "../src/NUtil.h"
+#include "../src/NPorting.h"
+#include "../src/NGlobals.h"
+#include "../src/NLog.h"
+#include "../src/NWMan.h"
+#include "../src/NRsc.h"
+#include "../src/NShader.h"
+#include "../src/NSquare.h"
+#include "../src/NImage.h"
+#include "../src/NSprite.h"
+#include "../src/NSpritesheet.h"
+#include "../src/NEntity.h"
+#include "../src/Game.h"
+
+END_HEAD
+
+#endif
--- a/samples/C/bitmap.h
+++ b/samples/C/bitmap.h
@@ -0,0 +1,47 @@
+#pragma once
+
+/* Copyright © 2010 Christoph Sünderhauf
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "generic.h"
+
+typedef struct {
+	uint32_t numbits;
+	/* an array large enough for numbits to fit in. Might 
+	 * (if numbits%8!=0) have some spare bits at the end
+	 */
+	uint32_t* bits;
+} bitmap_t;
+
+
+// creates a new bitmap.
+// CONTENT IS RANDOM!  - use bitmap_clearall() to clear the bitmap.
+bitmap_t bitmap_init(uint32_t numbits);
+
+// returns 1 or 0
+uint8_t bitmap_get(bitmap_t bitmap, uint32_t bitnum);
+// sets a bit (to 1)
+void bitmap_set(bitmap_t bitmap, uint32_t bitnum);
+// clears a bit (to 0)
+void bitmap_clear(bitmap_t bitmap, uint32_t bitnum);
+
+// clears every bit to 0
+void bitmap_clearAll(bitmap_t bitmap);
+
+// finds the first bit set to 0    returns 0 if no cleared bit found (0 is also returned if the first bit is cleared)
+uint32_t bitmap_findFirstClear(bitmap_t bitmap);
--- a/samples/C/color.h
+++ b/samples/C/color.h
@@ -0,0 +1,44 @@
+#pragma once
+
+/* Copyright © 2011 Fritz Grimpen
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <lib/generic.h>
+
+typedef struct {
+	uint32_t background;
+	uint32_t foreground;
+} console_color_t;
+
+#define CONSOLE_COLOR_BLACK    0x0
+#define CONSOLE_COLOR_BLUE     0x1
+#define CONSOLE_COLOR_GREEN    0x2
+#define CONSOLE_COLOR_CYAN     0x3
+#define CONSOLE_COLOR_RED      0x4
+#define CONSOLE_COLOR_MAGENTA  0x5
+#define CONSOLE_COLOR_BROWN    0x6
+#define CONSOLE_COLOR_LGREY    0x7
+#define CONSOLE_COLOR_DGREY    0x8
+#define CONSOLE_COLOR_LBLUE    0x9
+#define CONSOLE_COLOR_LGREEN   0xa
+#define CONSOLE_COLOR_LCYAN    0xb
+#define CONSOLE_COLOR_LRED     0xc
+#define CONSOLE_COLOR_LMAGENTA 0xd
+#define CONSOLE_COLOR_YELLOW   0xe
+#define CONSOLE_COLOR_WHITE    0xf
+
--- a/samples/C/driver.h
+++ b/samples/C/driver.h
@@ -0,0 +1,52 @@
+#pragma once
+
+/* Copyright © 2011 Fritz Grimpen
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <lib/generic.h>
+#include <console/info.h>
+
+#define CONSOLE_DRV_CAP_CLEAR 0x01
+#define CONSOLE_DRV_CAP_SCROLL  0x02
+#define CONSOLE_DRV_CAP_SET_CURSOR 0x04
+
+// Input modifier keys
+typedef struct {
+	bool shift_left:1;
+	bool shift_right:1;
+	bool control_left:1;
+	bool control_right:1;
+	bool alt:1;
+	bool super:1;
+} console_modifiers_t;
+
+typedef struct {
+	char character;
+	console_modifiers_t* modifiers;
+} console_read_t;
+
+typedef struct {
+	int (*write)(console_info_t*, char);
+	console_read_t* (*read)(console_info_t*);
+
+	int capabilities;
+
+	int (*_clear)(console_info_t*);
+	int (*scroll)(console_info_t*, int32_t);
+	void (*setCursor)(console_info_t*, uint32_t, uint32_t);
+} console_driver_t;
--- a/samples/C/elf.h
+++ b/samples/C/elf.h
@@ -0,0 +1,70 @@
+#pragma once
+
+/* Copyright © 2011 Lukas Martini
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <lib/generic.h>
+#include <tasks/scheduler.h>
+
+#define ELF_TYPE_NONE 0
+#define ELF_TYPE_REL 1
+#define ELF_TYPE_EXEC 2
+#define ELF_TYPE_DYN 3
+#define ELF_TYPE_CORE 4
+
+#define ELF_ARCH_NONE 0
+#define ELF_ARCH_386 3
+
+#define ELF_VERSION_CURRENT 1
+
+typedef struct {
+	unsigned char magic[4];
+	/* Note: There _is_ other stuff in here, but we don't need it */
+	unsigned char pad[12]; 
+} __attribute__((packed)) elf_ident_t;
+
+typedef struct {
+	uint32_t    type;
+	uint32_t    offset;
+	void*		virtaddr;
+	void*		physaddr;
+	uint32_t    filesize;
+	uint32_t    memsize;
+	uint32_t    flags;
+	uint32_t    alignment;
+} __attribute__((packed)) elf_program_t;
+
+typedef struct {
+	elf_ident_t ident;
+	uint16_t	type;		/* Object file type */
+	uint16_t	machine;	/* Architecture */
+	uint32_t	version;	/* Object file version */
+	void*		entry;		/* Entry point virtual address */
+	uint32_t	phoff;		/* Program header table file offset */
+	uint32_t	shoff;		/* Section header table file offset */
+	uint32_t	flags;		/* Processor-specific flags */
+	uint16_t	ehsize;		/* ELF header size in bytes */
+	uint16_t	phentsize;	/* Program header table entry size */
+	uint16_t	phnum;		/* Program header table entry count */
+	uint16_t	shentsize;	/* Section header table entry size */
+	uint16_t	shnum;		/* Section header table entry count */
+	uint16_t	shstrndx;	/* Section header string table index */
+} __attribute__((packed)) elf_t;
+
+task_t* elf_load(elf_t* bin, char* name, char** environ, char** argv, int argc);
+task_t* elf_load_file(char* path, char** environ, char** argv, int argc);
--- a/samples/C/exception.zep.c
+++ b/samples/C/exception.zep.c
@@ -0,0 +1,28 @@
+
+#ifdef HAVE_CONFIG_H
+#include "../../ext_config.h"
+#endif
+
+#include <php.h>
+#include "../../php_ext.h"
+#include "../../ext.h"
+
+#include <Zend/zend_operators.h>
+#include <Zend/zend_exceptions.h>
+#include <Zend/zend_interfaces.h>
+
+#include "kernel/main.h"
+
+
+/**
+ * Test\Router\Exception
+ *
+ * Exceptions generated by the router
+ */
+ZEPHIR_INIT_CLASS(Test_Router_Exception) {
+
+    ZEPHIR_REGISTER_CLASS_EX(Test\\Router, Exception, test, router_exception, zend_exception_get_default(TSRMLS_C), NULL, 0);
+
+    return SUCCESS;
+
+}
--- a/samples/C/exception.zep.h
+++ b/samples/C/exception.zep.h
@@ -0,0 +1,4 @@
+
+extern zend_class_entry *test_router_exception_ce;
+
+ZEPHIR_INIT_CLASS(Test_Router_Exception);
--- a/samples/C/filenames/script
+++ b/samples/C/filenames/script
--- a/samples/C/filter.h
+++ b/samples/C/filter.h
@@ -0,0 +1,45 @@
+#pragma once
+
+/* Copyright © 2011 Fritz Grimpen
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <lib/generic.h>
+#include <console/info.h>
+#include <console/driver.h>
+
+struct console_filter {
+	// General callback for all actions etc.
+	// Preferred prototype:
+	// char <name>(char c, console_info_t *info, console_driver_t *input, console_driver_t *output);
+	char (*callback)(char, console_info_t*, console_driver_t*, console_driver_t*);
+
+	// Specific callbacks for read and write
+	// Preferred prototype:
+	// char <name>(char c, console_info_t *info, console_driver_t *input);
+	char (*read_callback)(char, console_info_t*, console_driver_t*);
+
+	// Preferred prototype:
+	// char <name>(char c, console_info_t *info, console_driver_t *output);
+	char (*write_callback)(char, console_info_t*, console_driver_t*);
+
+	// The next filter in the filter chain
+	struct console_filter* next;
+};
+
+typedef struct console_filter console_filter_t;
+
--- a/samples/C/info.h
+++ b/samples/C/info.h
@@ -0,0 +1,44 @@
+#pragma once
+
+/* Copyright © 2011 Fritz Grimpen
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <lib/generic.h>
+#include <console/color.h>
+
+typedef struct {
+	uint32_t cursor_x;
+	uint32_t cursor_y;
+
+	uint32_t rows;
+	uint32_t columns;
+
+	uint32_t tabstop;
+
+	console_color_t default_color;
+	console_color_t current_color;
+
+	uint8_t nonblocking;
+	uint8_t reverse_video;
+	uint8_t bold;
+	uint8_t blink;
+	uint8_t underline;
+	uint8_t newline_mode;
+	uint8_t auto_echo;
+	uint8_t handle_backspace;
+} console_info_t;
--- a/samples/C/interface.h
+++ b/samples/C/interface.h
@@ -0,0 +1,47 @@
+#pragma once
+
+/* Copyright © 2011 Fritz Grimpen
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <lib/generic.h>
+#include <console/info.h>
+#include <console/filter.h>
+#include <console/driver.h>
+
+typedef struct {
+	console_info_t info;
+
+	console_filter_t* input_filter;
+	console_filter_t* output_filter;
+
+	console_driver_t* input_driver;
+	console_driver_t* output_driver;
+} console_t;
+
+console_t* default_console;
+
+// Generate raw console, connected to the Display, Keyboard and the
+// ECMA-48-Filter
+void console_init();
+
+size_t console_write(console_t* console, const char* buffer, int32_t length);
+#define console_write2(console, buffer) console_write(console, buffer, strlen(buffer))
+size_t console_read(console_t* console, char* buffer, size_t length);
+size_t console_scroll(console_t* console, int32_t pages);
+
+void console_clear(console_t* console);
--- a/samples/C/ip4.h
+++ b/samples/C/ip4.h
@@ -0,0 +1,50 @@
+#pragma once
+
+/* Copyright © 2011 Lukas Martini
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <lib/generic.h>
+#include <net/net.h>
+
+#define IP4_TOS_ICMP 0
+
+typedef uint32_t ip4_addr_t;
+
+typedef struct {
+	unsigned int hl:4; /* both fields are 4 bits */
+	unsigned int version:4;
+	uint8_t	tos;
+	uint16_t len;
+	uint16_t id;
+	uint16_t off;
+	uint8_t ttl;
+	uint8_t p;
+	uint16_t checksum;
+	ip4_addr_t src;
+	ip4_addr_t dst;
+} ip4_header_t;
+
+typedef struct {
+	uint8_t type;
+	uint8_t code;
+	uint16_t checksum;
+	uint16_t id;
+	uint16_t sequence;
+} ip4_icmp_header_t;
+
+void ip4_receive(net_device_t* origin, net_l2proto_t proto, size_t size, void* raw);
--- a/samples/C/multiboot.h
+++ b/samples/C/multiboot.h
@@ -0,0 +1,110 @@
+#pragma once
+
+/* Copyright © 2010, 2011 Lukas Martini
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <lib/generic.h>
+
+#define MULTIBOOT_KERNELMAGIC 0x2BADB002
+
+#define MULTIBOOT_FLAG_MEM	 0x001
+#define MULTIBOOT_FLAG_DEVICE  0x002
+#define MULTIBOOT_FLAG_CMDLINE 0x004
+#define MULTIBOOT_FLAG_MODS	0x008
+#define MULTIBOOT_FLAG_AOUT	0x010
+#define MULTIBOOT_FLAG_ELF	 0x020
+#define MULTIBOOT_FLAG_MMAP	0x040
+#define MULTIBOOT_FLAG_CONFIG  0x080
+#define MULTIBOOT_FLAG_LOADER  0x100
+#define MULTIBOOT_FLAG_APM	 0x200
+#define MULTIBOOT_FLAG_VBE	 0x400
+
+// The symbol table for a.out.
+typedef struct
+{
+	uint32_t	 tabSize;
+	uint32_t 	strSize;
+	uint32_t 	addr;
+	uint32_t 	reserved;
+} __attribute__((packed)) multiboot_aoutSymbolTable_t;
+     
+// The section header table for ELF.
+typedef struct
+{
+	uint32_t	 num;
+	uint32_t	 size;
+	uint32_t 	addr;
+	uint32_t	 shndx;
+} __attribute__((packed)) multiboot_elfSectionHeaderTable_t;
+
+typedef struct
+{
+	uint32_t	size;
+	uint64_t	addr;
+	uint64_t	length;
+	uint32_t	type;
+} __attribute__((packed)) multiboot_memoryMap_t;
+
+typedef struct
+{
+	uint32_t	start;
+	uint32_t	end;
+	char*		cmdLine;
+	uint32_t	reserved;
+} __attribute__((packed)) multiboot_module_t;
+
+typedef struct
+{
+	uint32_t	flags;
+	uint32_t	memLower;
+	uint32_t	memUpper;
+	uint32_t	bootDevice;
+	char*	cmdLine;
+	uint32_t	modsCount;
+	multiboot_module_t*	modsAddr;
+
+	union
+	{
+		multiboot_aoutSymbolTable_t aoutSym;
+		multiboot_elfSectionHeaderTable_t elfSec;
+	} u;
+	
+	uint32_t	mmapLength;
+	uint32_t	mmapAddr;
+	
+	uint32_t drivesLength;
+	uint32_t drivesAddr;
+	
+	// ROM configuration table
+	uint32_t configTable;
+	
+	char* bootLoaderName;
+	uint32_t apmTable;
+	
+	// Video
+	uint32_t vbeControlInfo;
+	uint32_t vbeModeInfo;
+	uint16_t vbeMode;
+	uint16_t vbeInterfaceSeg;
+	uint16_t vbeInterfaceOff;
+	uint16_t vbeInterfaceLen;
+} __attribute__((packed)) multiboot_info_t;
+
+multiboot_info_t* multiboot_info;
+
+void arch_multiboot_printInfo();
--- a/samples/C/ntru_encrypt.h
+++ b/samples/C/ntru_encrypt.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2014 FH Bielefeld
+ *
+ * This file is part of a FH Bielefeld project.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301  USA
+ */
+
+/**
+ * @file ntru_encrypt.h
+ * Header for the internal API of ntru_encrypt.c.
+ * @brief header for encrypt.c
+ */
+
+#ifndef PQC_ENCRYPT_H
+#define PQC_ENCRYPT_H
+
+
+#include "ntru_params.h"
+#include "ntru_poly.h"
+#include "ntru_string.h"
+
+#include <fmpz_poly.h>
+#include <fmpz.h>
+
+
+/**
+ * encrypt the msg, using the math:
+ * e = (h ∗ r) + m (mod q)
+ *
+ * e = the encrypted poly
+ *
+ * h = the public key
+ *
+ * r = the random poly
+ *
+ * m = the message poly
+ *
+ * q = large mod
+ *
+ * @param msg_tern the message to encrypt, in ternary format
+ * @param pub_key the public key
+ * @param rnd the random poly (should have relatively small
+ * coefficients, but not restricted to {-1, 0, 1})
+ * @param out the output poly which is in the range {0, q-1}
+ * (not ternary!) [out]
+ * @param params ntru_params the ntru context
+ */
+void
+ntru_encrypt_poly(
+		const fmpz_poly_t msg_tern,
+		const fmpz_poly_t pub_key,
+		const fmpz_poly_t rnd,
+		fmpz_poly_t out,
+		const ntru_params *params);
+
+/**
+ * Encrypt a message in the form of a null-terminated char array and
+ * return a string.
+ *
+ * @param msg the message
+ * @param pub_key the public key
+ * @param rnd the random poly (should have relatively small
+ * coefficients, but not restricted to {-1, 0, 1})
+ * @param params ntru_params the ntru context
+ * @return the newly allocated encrypted string
+ */
+string *
+ntru_encrypt_string(
+		const string *msg,
+		const fmpz_poly_t pub_key,
+		const fmpz_poly_t rnd,
+		const ntru_params *params);
+
+
+#endif /* PQC_ENCRYPT_H */
--- a/samples/C/portio.h
+++ b/samples/C/portio.h
@@ -0,0 +1,43 @@
+#pragma once
+
+/* Copyright © 2011 Lukas Martini
+ *
+ * This file is part of Xelix.
+ *
+ * Xelix is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Xelix is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Xelix. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <lib/generic.h>
+#include <lib/stdint.h>
+
+// Legacy
+#define outb(args...) portio_out8(args)
+#define outw(args...) portio_out16(args)
+#define outl(args...) portio_out32(args)
+#define outq(args...) portio_out64(args)
+
+#define inb(args...) portio_in8(args)
+#define inw(args...) portio_in16(args)
+#define inl(args...) portio_in32(args)
+#define inq(args...) portio_in64(args)
+
+void portio_out8(uint16_t port, uint8_t value);
+void portio_out16(uint16_t port, uint16_t value);
+void portio_out32(uint16_t port, uint32_t value);
+void portio_out64(uint16_t port, uint64_t value);
+
+uint8_t portio_in8(uint16_t port);
+uint16_t portio_in16(uint16_t port);
+uint32_t portio_in32(uint16_t port);
+uint64_t portio_in64(uint16_t port);
--- a/Show More
+++ b/Show More