one that got away.... :D
Merge pull request #644 from frankmayer/devel

one that got away.... :D