merging some details
Merge branch 'master' of https://github.com/envisioning/futurekit
mergint with rui