merge twice...
Merge pull request #49 from nearform/compile_specific_merge

merge twice...