diff --git a/HISTORY.md b/HISTORY.md
index ed99dcb..d5fa3fc 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,14 @@ A Makefile for Arduino Sketches
 
 The following is the rough list of changes that went into different versions. I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
 
+### 0.10.4 (2013-05-31) @matthijskooijman
+- Improved BAUD_RATE detection logic
+- Added logic to check if there is only .ino or .pde file
+- Compile .ino/.pde files directly
+- Output configuration only once
+- Try to read Version.txt file only if it is present
+- Refactored dependency code
+
 ###	0.10.3 16.xii 2012 gaftech
 - Enabling creation of EEPROM file (.eep)
 - EEPROM upload: eeprom and raw_eeprom targets
diff --git a/README.md b/README.md
index 5944f81..a8585db 100644
--- a/README.md
+++ b/README.md
@@ -59,14 +59,22 @@ is set to `$HOME/sketchbook`.
 
 ## Versioning
 
-The current version of the makefile is `0.10.3`. You can find the full history in the [HISTORY.md](HISTORY.md) file
+The current version of the makefile is `0.10.4`. You can find the full history in the [HISTORY.md](HISTORY.md) file
 
 This project adheres to Semantic [Versioning 2.0](http://semver.org/).
 
+## Contribution
+
+All contributions (even documentation) are welcome :) Open a pull request and I would be happy to merge them.
+
+If you are looking for ideas to work on, then check out the following TODO items.
+
 ## Know Issues / TODO's
-- Doesn't work with Leonardo yet.
-- More todo's at https://github.com/sudar/Arduino-Makefile/issues/
-- Because of the way the makefile is structured, the configuration parameters gets printed twice. 
+
+- Doesn't work with Leonardo yet. There are various fixes (#43, #37, #30) but need to verify them #44.
+- Doesn't work with Arduino 1.5.x yet.
+
+If you find an issue or have an idea for a feature then log them at https://github.com/sudar/Arduino-Makefile/issues/
 
 ## Similar works
 - It's not a derivative of this, but Alan Burlison has written a [similar thing](http://bleaklow.com/2010/06/04/a_makefile_for_arduino_sketches.html).
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index b52ed45..8d43c9b 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -1,6 +1,6 @@
 ########################################################################
 #
-# Arduino command line tools Makefile
+# Makefile for compiling Arduino sketches from command line
 # System part (i.e. project independent)
 #
 # Copyright (C) 2012 Sudar <http://sudarmuthu.com>, based on
@@ -19,7 +19,7 @@
 #
 # Original Arduino adaptation by mellis, eighthave, oli.keller
 #
-# Current version: 0.10.3
+# Current version: 0.10.4
 #
 # Refer to HISTORY.md file for complete history of changes
 #