Seconditial commit
Merge branch 'master' of https://github.com/proog/mgae-e2014