diff --git a/.gitmodules b/.gitmodules
index 8234378a..cde3e37b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -701,3 +701,6 @@
 [submodule "vendor/grammars/language-renpy"]
 	path = vendor/grammars/language-renpy
 	url = https://github.com/williamd1k0/language-renpy.git
+[submodule "vendor/grammars/atom-language-stan"]
+	path = vendor/grammars/atom-language-stan
+	url = git@github.com:jrnold/atom-language-stan.git
diff --git a/grammars.yml b/grammars.yml
index 8f7b1173..0319774a 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -187,6 +187,8 @@ vendor/grammars/atom-fsharp/:
 - 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
diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index c5eb9e6a..7d0b4ac3 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -3355,6 +3355,14 @@ Squirrel:
   tm_scope: source.c++
   ace_mode: c_cpp
 
+Stan:
+  type: programming
+  color: "#b2011d"
+  extensions:
+  - .stan
+  ace_mode: text
+  tm_scope: source.stan
+
 Standard ML:
   type: programming
   color: "#dc566d"
diff --git a/samples/Stan/congress.stan b/samples/Stan/congress.stan
new file mode 100644
index 00000000..6e7408e5
--- /dev/null
+++ b/samples/Stan/congress.stan
@@ -0,0 +1,14 @@
+data {
+  int<lower=0> N;
+  vector[N] incumbency_88;
+  vector[N] vote_86;
+  vector[N] vote_88;
+}
+parameters {
+  vector[3] beta;
+  real<lower=0> sigma;
+}
+model {
+    vote_88 ~ normal(beta[1] + beta[2] * vote_86
+                     + beta[3] * incumbency_88,sigma);
+}
diff --git a/samples/Stan/dogs.stan b/samples/Stan/dogs.stan
new file mode 100644
index 00000000..ebca16d7
--- /dev/null
+++ b/samples/Stan/dogs.stan
@@ -0,0 +1,31 @@
+data {
+  int<lower=0> n_dogs;
+  int<lower=0> n_trials;
+  int<lower=0,upper=1> y[n_dogs,n_trials];
+}
+parameters {
+  vector[3] beta;
+}
+transformed parameters {
+  matrix[n_dogs,n_trials] n_avoid;
+  matrix[n_dogs,n_trials] n_shock;
+  matrix[n_dogs,n_trials] p;
+
+  for (j in 1:n_dogs) {
+    n_avoid[j,1] <- 0;
+    n_shock[j,1] <- 0;
+    for (t in 2:n_trials) {
+      n_avoid[j,t] <- n_avoid[j,t-1] + 1 - y[j,t-1];
+      n_shock[j,t] <- n_shock[j,t-1] + y[j,t-1];
+    }
+    for (t in 1:n_trials)
+      p[j,t] <- beta[1] + beta[2] * n_avoid[j,t] + beta[3] * n_shock[j,t];
+  }
+}
+model {
+  beta ~ normal(0, 100);
+  for (i in 1:n_dogs) {
+    for (j in 1:n_trials)
+      y[i,j] ~ bernoulli_logit(p[i,j]);
+  }
+}
diff --git a/samples/Stan/schools.stan b/samples/Stan/schools.stan
new file mode 100644
index 00000000..171864a1
--- /dev/null
+++ b/samples/Stan/schools.stan
@@ -0,0 +1,26 @@
+data {
+  int<lower=0> N;
+  vector[N] y;
+  vector[N] sigma_y;
+}
+parameters {
+  vector[N] eta;
+  real mu_theta;
+  real<lower=0,upper=100> sigma_eta;
+  real xi;
+}
+transformed parameters {
+  real<lower=0> sigma_theta;
+  vector[N] theta;
+
+  theta <- mu_theta + xi * eta;
+  sigma_theta <- fabs(xi) / sigma_eta;
+}
+model {
+  mu_theta ~ normal(0, 100);
+  sigma_eta ~ inv_gamma(1, 1); //prior distribution can be changed to uniform
+
+  eta ~ normal(0, sigma_eta);
+  xi ~ normal(0, 5);
+  y ~ normal(theta,sigma_y);
+}
diff --git a/vendor/grammars/atom-language-stan b/vendor/grammars/atom-language-stan
new file mode 160000
index 00000000..72c626ae
--- /dev/null
+++ b/vendor/grammars/atom-language-stan
@@ -0,0 +1 @@
+Subproject commit 72c626ae96792809447ed4b4e20b8792025b7b95