Merge pull request #35 from adispring/master