UPDATED 12.8.2014 - Added some junkies.

Change-Id: I9a05a8af67520b34d0e10385987625897ca98ff9
Signed-off-by: Erik Hansen <mail.erik.hansen@gmail.com>