Update changes from Dropbox (final NWERC2013 Version)