Commit 18042013

Version a