feature ref #52 implemented
Merge remote-tracking branch 'origin/master' into f52
Merge pull request #4 from catmadevel/f52

F52