20140403.01 - Fixing #171 #180