Removed uselless line.
Merge branch '35_without_rails'
Removed LOCAL env.
Revert using LOCAL env
same
Merge pull request #4 from miry/master

Small fixes