Merge pull request #1 from boombastech/devel

testing