[WARWAR] - stash changes
Merge pull request #2 from michalbe/master-temp

[WARWAR] - stash changes