Squashed commit of the following:

commit e33e40af5df3ffd9933e774bad830e1af04b42ff
Author: shamahn <F:\AppData\The Bat!>
Date:   Wed Aug 7 17:59:37 2013 +0300

    FiX