WIP
Merge pull request #3 from byroot/merged-branch

WIP