fixed stuff mentioned by Patrik
Merge branch 'refact' of github.com:elador/FeatureDetection into refact