Merge pull request #313 from Ecotrust/master

merge to master
Merge pull request #314 from Ecotrust/solomon

Merge pull request #313 from Ecotrust/master