own merge...
remerge
Merge pull request #4 from jamast/master

final backward glance