removed printf statements for better profiling
merged
Merge remote-tracking branch 'origin/master'