merged mec2 with master
Merge pull request #3 from admalledd/master

merged mec2 with master