Merge pull request #56 from OneGet/wip

Wip