Merged changes from http://www.accuratuslabs.com/test on 08.04.2014