WIP
Merge pull request #7 from twokul/update

WIP