Merge pull request #313 from Ecotrust/master

merge to master