diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3020f5..a92f35e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+<a name="v0.2.1"></a>
+### v0.2.1 (2015-12-24)
+
+
+#### Improvements
+
+*   adds C, h++, cc, cxx, cp, and htm extensions ([ea4f540a](https://github.com/kbknapp/cargo-count/commit/ea4f540ac356dc946c42aaebe683f8c6d70fd362), closes [#19](https://github.com/kbknapp/cargo-count/issues/19))
+
+
+<a name="v0.2.0"></a>
+## v0.2.0 (2015-12-24)
+
+
+#### Improvements
+
+*   Ignore files in accordance with .gitignore ([a0c30706](https://github.com/kbknapp/cargo-count/commit/a0c307061413972b973f148802abe06e80a01099), Closes [#8](https://github.com/kbknapp/cargo-count/issues/8), [#9](https://github.com/kbknapp/cargo-count/issues/9))
+
+#### Bug Fixes
+
+*   fixes building on windows due to upstream dep ([3333f252](https://github.com/kbknapp/cargo-count/commit/3333f252f4c7e5e1324d5a178b9f020823283bc7))
+
+
+
 <a name="v0.1.4"></a>
 ### v0.1.4 (2015-11-14)
 
diff --git a/Cargo.lock b/Cargo.lock
index 88cfec2..c3deb4e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,13 +1,13 @@
 [root]
 name = "cargo-count"
-version = "0.1.5"
+version = "0.2.1"
 dependencies = [
- "ansi_term 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "clap 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "gitignore 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
  "tabwriter 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -22,7 +22,7 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.3.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "memchr 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -30,28 +30,28 @@ dependencies = [
 
 [[package]]
 name = "ansi_term"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bitflags"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "clap"
-version = "1.5.2"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "ansi_term 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "vec_map 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "clippy"
-version = "0.0.23"
+version = "0.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-normalization 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -73,7 +73,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -81,7 +81,7 @@ name = "memchr"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -90,16 +90,16 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex"
-version = "0.1.41"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index d931512..354ea89 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-count"
-version = "0.1.5"
+version = "0.2.1"
 authors = ["Kevin K <kbknapp@gmail.com>"]
 exclude = ["*.png"]
 description = "Cargo subcommand for displaying statistics about projects, such as code, comments, and unsafe counters"
diff --git a/src/language.rs b/src/language.rs
index cdd0af7..6607c97 100644
--- a/src/language.rs
+++ b/src/language.rs
@@ -26,7 +26,13 @@ impl Language {
     pub fn from_ext(ext: &str) -> Option<Language> {
         match ext {
             "cpp" => Some(Language::Cpp),
+            "cp" => Some(Language::Cpp),
+            "cc" => Some(Language::Cpp),
+            "cxx" => Some(Language::Cpp),
+            "c++" => Some(Language::Cpp),
+            "C" => Some(Language::Cpp),
             "hpp" => Some(Language::Hpp),
+            "h++" => Some(Language::Hpp),
             "c" => Some(Language::C),
             "h" => Some(Language::Header),
             "css" => Some(Language::Css),
@@ -35,6 +41,7 @@ impl Language {
             "rs" => Some(Language::Rust),
             "xml" => Some(Language::Xml),
             "html" => Some(Language::Html),
+            "htm" => Some(Language::Html),
             "py" => Some(Language::Python),
             "rb" => Some(Language::Ruby),
             "php" => Some(Language::Php),