Fixed broken project file.
Refined macro.
Pull request from @cboden. Added support and tests for mapping blocks as singleton.