20130511.02 - Fixing #7 #10