Simplifying dynamic build
Merge pull request #869 from delving/13.04-simpler-build

Simplifying dynamic build