Fixed and improved plan and profile
Experimenting
Fixed regeression
Merge pull request #48 from 28msec/fix-and-improve-plan-and-profile

Fixed and improved plan and profile