Merge pull request #29 from evoskuil/version2

Make build order consistent.