moved stuff around
Merge branch 'master' of https://github.com/etaubman/jway