Adding feature list
Merge branch 'master' of github.com:iciclenine/jim