[LMAG] - untrash
Merge pull request #25 from michalbe/master-temp

[LMAG] - untrash