Initial work
Merge branch 'master' of github.com:injoin/swrap