Major change!
Merge pull request #1 from AdaptiveMe/master

Update to master