Added some solution for NWERC 2011.
Minor cleanup.