wip
Merge pull request #2 from mar3/master

wip