updated code
Merge pull request #11 from mts-app/mts-app_12122014

updated code