20130509.03 - Fixing #2 #3