Prednaska2 2013 09 23

merging prednaska 2 into master