Merge pull request #42 from mtrubs/master

0.4
Merge pull request #43 from mtrubs/master

add images for wiki
Merge remote-tracking branch 'upstream/master'