bassic funcationality
Merge branch 'promise'