Merge pull request #203 from Alexpux/develop

Fix Python-2.7.5 patch
Merge pull request #204 from Alexpux/develop

Fix building make
DIE_IF_FALSE() macro argument renamed to "expr"
fixed identation in preprocessor code
Merge commit '282e22b79f735bd9bb510d9e2467bf5cd200eef3' into develop