Updated with fixed bugs from master;