changes
Merge pull request #31 from mts-app/mts-app_12122014

changes