more changes done while offline and without internet
Merge branch 'master' of github.com:littlenag/akwire