Merge pull request RainerKuemmerle#193 from mthz/master

fixed non-arm optimization flags

tagging the current state

Tag the state of the master branch before merging with the hierarchic…

…al branch